This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 7f5a9b9db4f Normalize SQL keywords to uppercase in test cases (#36820)
7f5a9b9db4f is described below
commit 7f5a9b9db4fc7f43d39b125c74f45477acacdedd
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Oct 8 20:12:56 2025 +0800
Normalize SQL keywords to uppercase in test cases (#36820)
---
.../OpenTelemetrySQLParserEngineAdviceTest.java | 2 +-
.../FirebirdPrepareStatementPacketTest.java | 6 ++--
.../checker/ShardingRouteCacheableCheckerTest.java | 38 +++++++++++-----------
.../cache/route/CachedShardingSQLRouterTest.java | 12 +++----
.../cache/route/cache/ShardingRouteCacheTest.java | 2 +-
.../engine/type/standard/SubqueryRouteTest.java | 34 +++++++++----------
.../props/domain/DataSourcePoolPropertiesTest.java | 6 ++--
.../parser/cache/SQLStatementCacheLoaderTest.java | 2 +-
.../sqltranslator/rule/SQLTranslatorRuleTest.java | 10 +++---
.../manager/DatabaseMetaDataManagerTest.java | 4 +--
.../database/cache/ParseTreeCacheLoaderTest.java | 2 +-
.../CreateDatabaseProxyBackendHandlerTest.java | 19 -----------
.../admin/FirebirdAdminExecutorCreatorTest.java | 4 +--
.../admin/MySQLAdminExecutorCreatorTest.java | 32 +++++++++---------
.../admin/OpenGaussAdminExecutorCreatorTest.java | 12 +++----
...enGaussSystemTableQueryExecutorCreatorTest.java | 4 +--
.../admin/PostgreSQLAdminExecutorCreatorTest.java | 10 +++---
.../command/MySQLCommandPacketFactoryTest.java | 2 +-
.../MySQLComStmtSendLongDataExecutorTest.java | 2 +-
.../prepare/MySQLComStmtPrepareExecutorTest.java | 8 ++---
.../query/MySQLComQueryPacketExecutorTest.java | 4 +--
...ySQLMultiStatementsProxyBackendHandlerTest.java | 9 +++--
.../bind/OpenGaussComBatchBindExecutorTest.java | 2 +-
.../command/query/extended/PortalTest.java | 2 +-
.../PostgreSQLBatchedStatementsExecutorTest.java | 2 +-
.../bind/PostgreSQLComBindExecutorTest.java | 2 +-
.../PostgreSQLComDescribeExecutorTest.java | 14 ++++----
.../parse/PostgreSQLComParseExecutorTest.java | 8 ++---
.../engine/ShowProcessListE2EIT.java | 2 +-
.../cases/alterresource/AddResourceTestCase.java | 4 +--
.../cases/alterresource/CloseResourceTestCase.java | 4 +--
.../SwitchingTransactionRuleTestCase.java | 8 ++---
.../cases/autocommit/MySQLAutoCommitTestCase.java | 12 +++----
.../autocommit/PostgreSQLAutoCommitTestCase.java | 12 +++----
.../cases/base/BaseTransactionTestCase.java | 6 ++--
.../classictransfer/ClassicTransferTestCase.java | 4 +--
.../BroadcastTableTransactionTestCase.java | 6 ++--
.../ExceptionInTransactionTestCase.java | 4 +--
.../MultiJDBCConnectionsTestCase.java | 4 +--
.../MultiTransactionInConnectionTestCase.java | 2 +-
.../SingleTableCommitAndRollbackTestCase.java | 4 +--
.../readonly/PostgreSQLSetReadOnlyTestCase.java | 4 +--
.../cases/readonly/SetReadOnlyTestCase.java | 6 ++--
.../cases/savepoint/BaseSavePointTestCase.java | 12 +++----
.../cases/truncate/MySQLXATruncateTestCase.java | 4 +--
.../PostgreSQLAndOpenGaussTruncateTestCase.java | 8 ++---
.../commons/repository/AddressRepository.java | 4 +--
.../test/natived/jdbc/modes/cluster/EtcdTest.java | 6 ++--
.../natived/jdbc/modes/cluster/ZookeeperTest.java | 6 ++--
49 files changed, 178 insertions(+), 198 deletions(-)
diff --git
a/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetrySQLParserEngineAdviceTest.java
b/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetrySQLParserEngineAdviceTest.java
index 526e014ba3c..1cb6c967800 100644
---
a/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetrySQLParserEngineAdviceTest.java
+++
b/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetrySQLParserEngineAdviceTest.java
@@ -43,7 +43,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
class OpenTelemetrySQLParserEngineAdviceTest {
- private static final String SQL = "select 1";
+ private static final String SQL = "SELECT 1";
private final InMemorySpanExporter testExporter =
InMemorySpanExporter.create();
diff --git
a/database/protocol/dialect/firebird/src/test/java/org/apache/shardingsphere/database/protocol/firebird/packet/command/query/statement/prepare/FirebirdPrepareStatementPacketTest.java
b/database/protocol/dialect/firebird/src/test/java/org/apache/shardingsphere/database/protocol/firebird/packet/command/query/statement/prepare/FirebirdPrepareStatementPacketTest.java
index ae0fc54231d..278cab855c9 100644
---
a/database/protocol/dialect/firebird/src/test/java/org/apache/shardingsphere/database/protocol/firebird/packet/command/query/statement/prepare/FirebirdPrepareStatementPacketTest.java
+++
b/database/protocol/dialect/firebird/src/test/java/org/apache/shardingsphere/database/protocol/firebird/packet/command/query/statement/prepare/FirebirdPrepareStatementPacketTest.java
@@ -47,7 +47,7 @@ class FirebirdPrepareStatementPacketTest {
void assertPrepareStatementPacket() {
doNothing().when(payload).skipReserved(anyInt());
when(payload.readInt4()).thenReturn(1, 2, 3, 10);
- when(payload.readString()).thenReturn("select 1");
+ when(payload.readString()).thenReturn("SELECT 1");
when(payload.readBuffer()).thenReturn(byteBuf);
when(byteBuf.isReadable()).thenReturn(true, true, false);
when(byteBuf.readByte()).thenReturn((byte)
FirebirdSQLInfoPacketType.STMT_TYPE.getCode(), (byte)
FirebirdSQLInfoPacketType.DESCRIBE_VARS.getCode());
@@ -56,7 +56,7 @@ class FirebirdPrepareStatementPacketTest {
assertThat(packet.getTransactionId(), is(1));
assertThat(packet.getStatementId(), is(2));
assertThat(packet.getSqlDialect(), is(3));
- assertThat(packet.getSQL(), is("select 1"));
+ assertThat(packet.getSQL(), is("SELECT 1"));
assertTrue(packet.isValidStatementHandle());
assertTrue(packet.nextItem());
assertThat(packet.getCurrentItem(),
is(FirebirdSQLInfoPacketType.STMT_TYPE));
@@ -69,7 +69,7 @@ class FirebirdPrepareStatementPacketTest {
void assertIsValidStatementHandleWhenInvalid() {
doNothing().when(payload).skipReserved(anyInt());
when(payload.readInt4()).thenReturn(1, 0xFFFF, 3, 10);
- when(payload.readString()).thenReturn("select 1");
+ when(payload.readString()).thenReturn("SELECT 1");
when(payload.readBuffer()).thenReturn(byteBuf);
when(byteBuf.isReadable()).thenReturn(false);
FirebirdPrepareStatementPacket packet = new
FirebirdPrepareStatementPacket(payload);
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/cache/checker/ShardingRouteCacheableCheckerTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/cache/checker/ShardingRouteCacheableCheckerTest.java
index 0aab108020f..0e3152456bf 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/cache/checker/ShardingRouteCacheableCheckerTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/cache/checker/ShardingRouteCacheableCheckerTest.java
@@ -173,26 +173,26 @@ class ShardingRouteCacheableCheckerTest {
@Override
public Stream<? extends Arguments> provideArguments(final
ParameterDeclarations parameters, final ExtensionContext context) {
Collection<? extends Arguments> probablyCacheableCases =
Arrays.asList(
- Arguments.of("insert into t_warehouse (id) values (?)",
Collections.singletonList(1), true, Collections.singletonList(0)),
- Arguments.of("select * from t_warehouse where id = ?",
Collections.singletonList(1), true, Collections.singletonList(0)),
- Arguments.of("select * from t_warehouse where id in (?, ?,
?)", Arrays.asList(1, 2, 3), true, Arrays.asList(0, 1, 2)),
- Arguments.of("select * from t_warehouse where id between ?
and ?", Arrays.asList(1, 10), true, Arrays.asList(0, 1)),
- Arguments.of("select * from t_warehouse where id between ?
and ? limit ? offset ?", Arrays.asList(1, 10, 100, 50), true, Arrays.asList(0,
1)),
- Arguments.of("update t_warehouse set warehouse_name = ?
where id = ?", Arrays.asList("foo", 1), true, Collections.singletonList(1)),
- Arguments.of("delete from t_warehouse where id = ?",
Collections.singletonList(1), true, Collections.singletonList(0)));
+ Arguments.of("INSERT INTO t_warehouse (id) VALUES (?)",
Collections.singletonList(1), true, Collections.singletonList(0)),
+ Arguments.of("SELECT * FROM t_warehouse WHERE id = ?",
Collections.singletonList(1), true, Collections.singletonList(0)),
+ Arguments.of("SELECT * FROM t_warehouse WHERE id in (?, ?,
?)", Arrays.asList(1, 2, 3), true, Arrays.asList(0, 1, 2)),
+ Arguments.of("SELECT * FROM t_warehouse WHERE id BETWEEN ?
AND ?", Arrays.asList(1, 10), true, Arrays.asList(0, 1)),
+ Arguments.of("SELECT * FROM t_warehouse WHERE id BETWEEN ?
AND ? LIMIT ? OFFSET ?", Arrays.asList(1, 10, 100, 50), true, Arrays.asList(0,
1)),
+ Arguments.of("UPDATE t_warehouse SET warehouse_name = ?
WHERE id = ?", Arrays.asList("foo", 1), true, Collections.singletonList(1)),
+ Arguments.of("DELETE FROM t_warehouse WHERE id = ?",
Collections.singletonList(1), true, Collections.singletonList(0)));
Collection<? extends Arguments> nonCacheableCases = Arrays.asList(
- Arguments.of("create table t_warehouse_for_create (id int4
not null primary key)", Collections.emptyList(), false,
Collections.emptyList()),
- Arguments.of("insert into t_warehouse (id) select
warehouse_id from t_order", Collections.emptyList(), false,
Collections.emptyList()),
- Arguments.of("insert into t_warehouse (id) values (?),
(?)", Arrays.asList(1, 2), false, Collections.emptyList()),
- Arguments.of("insert into t_non_sharding_table (id) values
(?)", Collections.singletonList(1), false, Collections.emptyList()),
- Arguments.of("insert into
t_non_cacheable_database_sharding (id) values (?)",
Collections.singletonList(1), false, Collections.emptyList()),
- Arguments.of("insert into t_non_cacheable_table_sharding
(id) values (?)", Collections.singletonList(1), false, Collections.emptyList()),
- Arguments.of("insert into t_warehouse (id) values
(now())", Collections.emptyList(), false, Collections.emptyList()),
- Arguments.of("select * from t_warehouse w join t_order o
on w.id = o.warehouse_id where w.id = ?", Collections.singletonList(1), false,
Collections.emptyList()),
- Arguments.of("update t_warehouse set warehouse_name = ?
where id = (select max(warehouse_id) from t_order)",
Collections.singletonList("foo"), false, Collections.emptyList()),
- Arguments.of("delete from t_order where warehouse_id in
(1, 2, now())", Collections.emptyList(), false, Collections.emptyList()),
- Arguments.of("delete from t_order where warehouse_id
between now() and now()", Collections.emptyList(), false,
Collections.emptyList()),
- Arguments.of("delete from t_order o where o.warehouse_id
in (select w.id from t_warehouse w)", Collections.emptyList(), false,
Collections.emptyList()));
+ Arguments.of("CREATE TABLE t_warehouse_for_create (id int4
not null primary key)", Collections.emptyList(), false,
Collections.emptyList()),
+ Arguments.of("INSERT INTO t_warehouse (id) SELECT
warehouse_id FROM t_order", Collections.emptyList(), false,
Collections.emptyList()),
+ Arguments.of("INSERT INTO t_warehouse (id) VALUES (?),
(?)", Arrays.asList(1, 2), false, Collections.emptyList()),
+ Arguments.of("INSERT INTO t_non_sharding_table (id) VALUES
(?)", Collections.singletonList(1), false, Collections.emptyList()),
+ Arguments.of("INSERT INTO
t_non_cacheable_database_sharding (id) VALUES (?)",
Collections.singletonList(1), false, Collections.emptyList()),
+ Arguments.of("INSERT INTO t_non_cacheable_table_sharding
(id) VALUES (?)", Collections.singletonList(1), false, Collections.emptyList()),
+ Arguments.of("INSERT INTO t_warehouse (id) VALUES
(now())", Collections.emptyList(), false, Collections.emptyList()),
+ Arguments.of("SELECT * FROM t_warehouse w JOIN t_order o
on w.id = o.warehouse_id WHERE w.id = ?", Collections.singletonList(1), false,
Collections.emptyList()),
+ Arguments.of("UPDATE t_warehouse SET warehouse_name = ?
WHERE id = (SELECT max(warehouse_id) FROM t_order)",
Collections.singletonList("foo"), false, Collections.emptyList()),
+ Arguments.of("DELETE FROM t_order WHERE warehouse_id in
(1, 2, now())", Collections.emptyList(), false, Collections.emptyList()),
+ Arguments.of("DELETE FROM t_order WHERE warehouse_id
BETWEEN now() AND now()", Collections.emptyList(), false,
Collections.emptyList()),
+ Arguments.of("DELETE FROM t_order o WHERE o.warehouse_id
IN (SELECT w.id FROM t_warehouse w)", Collections.emptyList(), false,
Collections.emptyList()));
return Stream.of(probablyCacheableCases.stream(),
nonCacheableCases.stream()).flatMap(Function.identity());
}
}
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/cache/route/CachedShardingSQLRouterTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/cache/route/CachedShardingSQLRouterTest.java
index 9deec4d7475..491a78a65bd 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/cache/route/CachedShardingSQLRouterTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/cache/route/CachedShardingSQLRouterTest.java
@@ -74,7 +74,7 @@ class CachedShardingSQLRouterTest {
when(shardingCache.getConfiguration()).thenReturn(new
ShardingCacheConfiguration(1, null));
when(sqlStatementContext.getTablesContext().getDatabaseNames()).thenReturn(Collections.emptyList());
QueryContext queryContext =
- new QueryContext(sqlStatementContext, "select 1",
Collections.emptyList(), new HintValueContext(), mockConnectionContext(),
mock(ShardingSphereMetaData.class));
+ new QueryContext(sqlStatementContext, "SELECT 1",
Collections.emptyList(), new HintValueContext(), mockConnectionContext(),
mock(ShardingSphereMetaData.class));
Optional<RouteContext> actual = new
CachedShardingSQLRouter().loadRouteContext(null, queryContext,
mock(RuleMetaData.class), null, shardingCache, Collections.emptyList(), null);
assertFalse(actual.isPresent());
}
@@ -88,7 +88,7 @@ class CachedShardingSQLRouterTest {
@Test
void assertCreateRouteContextWithNotCacheableQuery() {
QueryContext queryContext =
- new QueryContext(sqlStatementContext, "insert into t values
(?), (?)", Collections.emptyList(), new HintValueContext(),
mockConnectionContext(), mock(ShardingSphereMetaData.class));
+ new QueryContext(sqlStatementContext, "INSERT INTO t VALUES
(?), (?)", Collections.emptyList(), new HintValueContext(),
mockConnectionContext(), mock(ShardingSphereMetaData.class));
when(shardingCache.getConfiguration()).thenReturn(new
ShardingCacheConfiguration(100, null));
when(shardingCache.getRouteCacheableChecker()).thenReturn(mock(ShardingRouteCacheableChecker.class));
when(shardingCache.getRouteCacheableChecker().check(null,
queryContext)).thenReturn(new ShardingRouteCacheableCheckResult(false,
Collections.emptyList()));
@@ -99,7 +99,7 @@ class CachedShardingSQLRouterTest {
@Test
void assertCreateRouteContextWithUnmatchedActualParameterSize() {
QueryContext queryContext =
- new QueryContext(sqlStatementContext, "insert into t values
(?, ?)", Collections.singletonList(0), new HintValueContext(),
mockConnectionContext(), mock(ShardingSphereMetaData.class));
+ new QueryContext(sqlStatementContext, "INSERT INTO t VALUES
(?, ?)", Collections.singletonList(0), new HintValueContext(),
mockConnectionContext(), mock(ShardingSphereMetaData.class));
when(shardingCache.getConfiguration()).thenReturn(new
ShardingCacheConfiguration(100, null));
when(shardingCache.getRouteCacheableChecker()).thenReturn(mock(ShardingRouteCacheableChecker.class));
when(shardingCache.getRouteCacheableChecker().check(null,
queryContext)).thenReturn(new ShardingRouteCacheableCheckResult(true,
Collections.singletonList(1)));
@@ -110,7 +110,7 @@ class CachedShardingSQLRouterTest {
@Test
void assertCreateRouteContextWithCacheableQueryButCacheMissed() {
QueryContext queryContext =
- new QueryContext(sqlStatementContext, "insert into t values
(?, ?)", Arrays.asList(0, 1), new HintValueContext(), mockConnectionContext(),
mock(ShardingSphereMetaData.class));
+ new QueryContext(sqlStatementContext, "INSERT INTO t VALUES
(?, ?)", Arrays.asList(0, 1), new HintValueContext(), mockConnectionContext(),
mock(ShardingSphereMetaData.class));
when(shardingCache.getConfiguration()).thenReturn(new
ShardingCacheConfiguration(100, null));
when(shardingCache.getRouteCacheableChecker()).thenReturn(mock(ShardingRouteCacheableChecker.class));
when(shardingCache.getRouteCacheableChecker().check(null,
queryContext)).thenReturn(new ShardingRouteCacheableCheckResult(true,
Collections.singletonList(1)));
@@ -130,7 +130,7 @@ class CachedShardingSQLRouterTest {
@Test
void assertCreateRouteContextWithCacheHit() {
QueryContext queryContext =
- new QueryContext(sqlStatementContext, "insert into t values
(?, ?)", Arrays.asList(0, 1), new HintValueContext(), mockConnectionContext(),
mock(ShardingSphereMetaData.class));
+ new QueryContext(sqlStatementContext, "INSERT INTO t VALUES
(?, ?)", Arrays.asList(0, 1), new HintValueContext(), mockConnectionContext(),
mock(ShardingSphereMetaData.class));
when(shardingCache.getConfiguration()).thenReturn(new
ShardingCacheConfiguration(100, null));
when(shardingCache.getRouteCacheableChecker()).thenReturn(mock(ShardingRouteCacheableChecker.class));
when(shardingCache.getRouteCacheableChecker().check(null,
queryContext)).thenReturn(new ShardingRouteCacheableCheckResult(true,
Collections.singletonList(1)));
@@ -150,7 +150,7 @@ class CachedShardingSQLRouterTest {
@Test
void assertCreateRouteContextWithQueryRoutedToMultiDataNodes() {
QueryContext queryContext =
- new QueryContext(sqlStatementContext, "select * from t",
Collections.emptyList(), new HintValueContext(), mockConnectionContext(),
mock(ShardingSphereMetaData.class));
+ new QueryContext(sqlStatementContext, "SELECT * FROM t",
Collections.emptyList(), new HintValueContext(), mockConnectionContext(),
mock(ShardingSphereMetaData.class));
when(shardingCache.getConfiguration()).thenReturn(new
ShardingCacheConfiguration(100, null));
when(shardingCache.getRouteCacheableChecker()).thenReturn(mock(ShardingRouteCacheableChecker.class));
when(shardingCache.getRouteCacheableChecker().check(null,
queryContext)).thenReturn(new ShardingRouteCacheableCheckResult(true,
Collections.emptyList()));
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/cache/route/cache/ShardingRouteCacheTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/cache/route/cache/ShardingRouteCacheTest.java
index 86da79be48e..70a202e5f84 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/cache/route/cache/ShardingRouteCacheTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/cache/route/cache/ShardingRouteCacheTest.java
@@ -31,7 +31,7 @@ class ShardingRouteCacheTest {
@Test
void assertPutAndGet() {
ShardingRouteCache cache = new ShardingRouteCache(new
ShardingCacheOptionsConfiguration(true, 1, 1));
- ShardingRouteCacheKey key = new ShardingRouteCacheKey("select name
from t where id = ?", Collections.singletonList(1));
+ ShardingRouteCacheKey key = new ShardingRouteCacheKey("SELECT name
FROM t WHERE id = ?", Collections.singletonList(1));
assertFalse(cache.get(key).isPresent());
cache.put(key, new ShardingRouteCacheValue(new RouteContext()));
assertTrue(cache.get(key).isPresent());
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/SubqueryRouteTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/SubqueryRouteTest.java
index 0996fff984c..eb2bab0d2fb 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/SubqueryRouteTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/SubqueryRouteTest.java
@@ -46,7 +46,7 @@ class SubqueryRouteTest {
HintManager hintManager = HintManager.getInstance();
hintManager.addDatabaseShardingValue("t_hint_test", 1);
hintManager.addTableShardingValue("t_hint_test", 1);
- String sql = "select count(*) from t_hint_test where user_id = (select
user_id from t_hint_test where user_id in (?,?,?)) ";
+ String sql = "SELECT COUNT(*) FROM t_hint_test WHERE user_id = (SELECT
user_id FROM t_hint_test WHERE user_id IN (?,?,?)) ";
ShardingRouteAssert.assertRoute(sql, Arrays.asList(1, 3, 5));
hintManager.close();
}
@@ -57,36 +57,36 @@ class SubqueryRouteTest {
public Stream<? extends Arguments> provideArguments(final
ParameterDeclarations parameters, final ExtensionContext context) {
return Stream.of(
Arguments.of("oneTableDifferentConditionWithFederation",
- "select (select max(id) from t_order b where
b.user_id =? ) from t_order a where user_id = ? ", Arrays.asList(3, 2)),
+ "SELECT (SELECT MAX(id) FROM t_order b WHERE
b.user_id =? ) FROM t_order a WHERE user_id = ? ", Arrays.asList(3, 2)),
Arguments.of("oneTableSameConditionWithFederation",
- "select (select max(id) from t_order b where
b.user_id = ? and b.user_id = a.user_id) from t_order a where user_id = ? ",
Arrays.asList(1, 1)),
+ "SELECT (SELECT MAX(id) FROM t_order b WHERE
b.user_id = ? AND b.user_id = a.user_id) FROM t_order a WHERE user_id = ? ",
Arrays.asList(1, 1)),
Arguments.of("bindingTableWithFederation",
- "select (select max(id) from t_order_item b where
b.user_id = ?) from t_order a where user_id = ? ", Arrays.asList(1, 1)),
+ "SELECT (SELECT MAX(id) FROM t_order_item b WHERE
b.user_id = ?) FROM t_order a WHERE user_id = ? ", Arrays.asList(1, 1)),
Arguments.of("notShardingTable",
- "select (select max(id) from t_category b where
b.id = ?) from t_category a where id = ? ", Arrays.asList(1, 1)),
+ "SELECT (SELECT MAX(id) FROM t_category b WHERE
b.id = ?) FROM t_category a WHERE id = ? ", Arrays.asList(1, 1)),
Arguments.of("bindingTableWithDifferentValueWithFederation",
- "select (select max(id) from t_order_item b where
b.user_id = ? ) from t_order a where user_id = ? ", Arrays.asList(2, 3)),
+ "SELECT (SELECT MAX(id) FROM t_order_item b WHERE
b.user_id = ? ) FROM t_order a WHERE user_id = ? ", Arrays.asList(2, 3)),
Arguments.of("twoTableWithDifferentOperatorWithFederation",
- "select (select max(id) from t_order_item b where
b.user_id in(?,?)) from t_order a where user_id = ? ", Arrays.asList(1, 2, 1)),
+ "SELECT (SELECT MAX(id) FROM t_order_item b WHERE
b.user_id in(?,?)) FROM t_order a WHERE user_id = ? ", Arrays.asList(1, 2, 1)),
Arguments.of("twoTableWithInWithFederation",
- "select (select max(id) from t_order_item b where
b.user_id in(?,?)) from t_order a where user_id in(?,?) ", Arrays.asList(1, 2,
1, 3)),
+ "SELECT (SELECT MAX(id) FROM t_order_item b WHERE
b.user_id in(?,?)) FROM t_order a WHERE user_id in(?,?) ", Arrays.asList(1, 2,
1, 3)),
Arguments.of("subqueryInSubqueryError",
- "select (select status from t_order b where
b.user_id =? and status = (select status from t_order b where b.user_id =?)) as
c from t_order a "
- + "where status = (select status from
t_order b where b.user_id =? and status = (select status from t_order b where
b.user_id =?))",
+ "SELECT (SELECT status FROM t_order b WHERE
b.user_id =? AND status = (SELECT status FROM t_order b WHERE b.user_id =?)) as
c FROM t_order a "
+ + "WHERE status = (SELECT status FROM
t_order b WHERE b.user_id =? AND status = (SELECT status FROM t_order b WHERE
b.user_id =?))",
Arrays.asList(11, 2, 1, 1)),
Arguments.of("subqueryInSubquery",
- "select (select status from t_order b where
b.user_id =? and status = (select status from t_order b where b.user_id =?)) as
c from t_order a "
- + "where status = (select status from
t_order b where b.user_id =? and status = (select status from t_order b where
b.user_id =?))",
+ "SELECT (SELECT status FROM t_order b WHERE
b.user_id =? AND status = (SELECT status FROM t_order b WHERE b.user_id =?)) as
c FROM t_order a "
+ + "WHERE status = (SELECT status FROM
t_order b WHERE b.user_id =? AND status = (SELECT status FROM t_order b WHERE
b.user_id =?))",
Arrays.asList(1, 1, 1, 1)),
Arguments.of("subqueryInFromError",
- "select b.status from t_order b join (select
user_id,status from t_order b where b.user_id =?) c on b.user_id = c.user_id
where b.user_id =? ", Arrays.asList(11, 1)),
+ "SELECT b.status FROM t_order b join (SELECT
user_id,status FROM t_order b WHERE b.user_id =?) c ON b.user_id = c.user_id
WHERE b.user_id =? ", Arrays.asList(11, 1)),
Arguments.of("subqueryInFrom",
- "select b.status from t_order b join (select
user_id,status from t_order b where b.user_id =?) c on b.user_id = c.user_id
where b.user_id =? ", Arrays.asList(1, 1)),
+ "SELECT b.status FROM t_order b join (SELECT
user_id,status FROM t_order b WHERE b.user_id =?) c ON b.user_id = c.user_id
WHERE b.user_id =? ", Arrays.asList(1, 1)),
Arguments.of("subqueryForAggregation",
- "select count(*) from t_order where user_id =
(select user_id from t_order where user_id =?) ", Collections.singletonList(1)),
+ "SELECT count(*) FROM t_order WHERE user_id =
(SELECT user_id FROM t_order WHERE user_id =?) ", Collections.singletonList(1)),
Arguments.of("subqueryForBinding",
- "select count(*) from t_order where user_id =
(select user_id from t_order_item where user_id =?) ",
Collections.singletonList(1)),
- Arguments.of("subqueryWithOneInstance", "select count(*)
from t_order where user_id =?", Collections.singletonList(1)));
+ "SELECT count(*) FROM t_order WHERE user_id =
(SELECT user_id FROM t_order_item WHERE user_id =?) ",
Collections.singletonList(1)),
+ Arguments.of("subqueryWithOneInstance", "SELECT COUNT(*)
FROM t_order WHERE user_id =?", Collections.singletonList(1)));
}
}
}
diff --git
a/infra/data-source-pool/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/props/domain/DataSourcePoolPropertiesTest.java
b/infra/data-source-pool/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/props/domain/DataSourcePoolPropertiesTest.java
index 120057b6713..5d587a02007 100644
---
a/infra/data-source-pool/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/props/domain/DataSourcePoolPropertiesTest.java
+++
b/infra/data-source-pool/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/props/domain/DataSourcePoolPropertiesTest.java
@@ -47,7 +47,7 @@ class DataSourcePoolPropertiesTest {
actualDataSource.setUrl("jdbc:mock://127.0.0.1/foo_ds");
actualDataSource.setUsername("root");
actualDataSource.setPassword("root");
- actualDataSource.setConnectionInitSqls(Arrays.asList("set names
utf8mb4;", "set names utf8;"));
+ actualDataSource.setConnectionInitSqls(Arrays.asList("SET names
utf8mb4;", "SET names utf8;"));
DataSourcePoolProperties actual =
DataSourcePoolPropertiesCreator.create(actualDataSource);
assertThat(actual.getPoolClassName(),
is(MockedDataSource.class.getName()));
assertThat(actual.getAllLocalProperties().get("driverClassName").toString(),
is(MockedDataSource.class.getName()));
@@ -57,8 +57,8 @@ class DataSourcePoolPropertiesTest {
assertNull(actual.getAllLocalProperties().get("loginTimeout"));
assertThat(actual.getAllLocalProperties().get("connectionInitSqls"),
isA(List.class));
List<String> actualConnectionInitSql = (List<String>)
actual.getAllLocalProperties().get("connectionInitSqls");
- assertThat(actualConnectionInitSql, hasItem("set names utf8mb4;"));
- assertThat(actualConnectionInitSql, hasItem("set names utf8;"));
+ assertThat(actualConnectionInitSql, hasItem("SET names utf8mb4;"));
+ assertThat(actualConnectionInitSql, hasItem("SET names utf8;"));
}
@Test
diff --git
a/infra/parser/src/test/java/org/apache/shardingsphere/infra/parser/cache/SQLStatementCacheLoaderTest.java
b/infra/parser/src/test/java/org/apache/shardingsphere/infra/parser/cache/SQLStatementCacheLoaderTest.java
index eefc7ecf9ce..d5762497c5e 100644
---
a/infra/parser/src/test/java/org/apache/shardingsphere/infra/parser/cache/SQLStatementCacheLoaderTest.java
+++
b/infra/parser/src/test/java/org/apache/shardingsphere/infra/parser/cache/SQLStatementCacheLoaderTest.java
@@ -32,7 +32,7 @@ import static org.mockito.Mockito.mock;
class SQLStatementCacheLoaderTest {
- private static final String SQL = "select * from user where id=1";
+ private static final String SQL = "SELECT * FROM user WHERE id=1";
@Test
void assertSQLStatementCacheLoad() throws ReflectiveOperationException {
diff --git
a/kernel/sql-translator/core/src/test/java/org/apache/shardingsphere/sqltranslator/rule/SQLTranslatorRuleTest.java
b/kernel/sql-translator/core/src/test/java/org/apache/shardingsphere/sqltranslator/rule/SQLTranslatorRuleTest.java
index bd74230eb72..c63911ba208 100644
---
a/kernel/sql-translator/core/src/test/java/org/apache/shardingsphere/sqltranslator/rule/SQLTranslatorRuleTest.java
+++
b/kernel/sql-translator/core/src/test/java/org/apache/shardingsphere/sqltranslator/rule/SQLTranslatorRuleTest.java
@@ -43,7 +43,7 @@ class SQLTranslatorRuleTest {
@Test
void assertTranslateWhenProtocolSameAsStorage() {
- String expected = "select 1";
+ String expected = "SELECT 1";
DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "PostgreSQL");
QueryContext queryContext = mock(QueryContext.class,
RETURNS_DEEP_STUBS);
when(queryContext.getSqlStatementContext().getSqlStatement().getDatabaseType()).thenReturn(databaseType);
@@ -53,7 +53,7 @@ class SQLTranslatorRuleTest {
@Test
void assertTranslateWhenNoStorage() {
- String expected = "select 1";
+ String expected = "SELECT 1";
DatabaseType sqlParserType =
TypedSPILoader.getService(DatabaseType.class, "PostgreSQL");
QueryContext queryContext = mock(QueryContext.class,
RETURNS_DEEP_STUBS);
when(queryContext.getSqlStatementContext().getSqlStatement().getDatabaseType()).thenReturn(sqlParserType);
@@ -63,7 +63,7 @@ class SQLTranslatorRuleTest {
@Test
void assertTranslateWithProtocolDifferentWithStorage() {
- String input = "select 1";
+ String input = "SELECT 1";
DatabaseType sqlParserType =
TypedSPILoader.getService(DatabaseType.class, "MySQL");
QueryContext queryContext = mock(QueryContext.class,
RETURNS_DEEP_STUBS);
when(queryContext.getSqlStatementContext().getSqlStatement().getDatabaseType()).thenReturn(sqlParserType);
@@ -75,7 +75,7 @@ class SQLTranslatorRuleTest {
@Test
void assertUseOriginalSQLWhenTranslatingFailed() {
- String expected = "ERROR: select 1";
+ String expected = "ERROR: SELECT 1";
DatabaseType sqlParserType =
TypedSPILoader.getService(DatabaseType.class, "PostgreSQL");
QueryContext queryContext = mock(QueryContext.class,
RETURNS_DEEP_STUBS);
when(queryContext.getSqlStatementContext().getSqlStatement().getDatabaseType()).thenReturn(sqlParserType);
@@ -91,7 +91,7 @@ class SQLTranslatorRuleTest {
when(queryContext.getSqlStatementContext().getSqlStatement().getDatabaseType()).thenReturn(sqlParserType);
DatabaseType storageType =
TypedSPILoader.getService(DatabaseType.class, "MySQL");
assertThrows(UnsupportedTranslatedDatabaseException.class,
- () -> createSQLTranslatorRule(false).translate("ERROR: select
1", Collections.emptyList(), queryContext, storageType, mock(), mock()));
+ () -> createSQLTranslatorRule(false).translate("ERROR: SELECT
1", Collections.emptyList(), queryContext, storageType, mock(), mock()));
}
@Test
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/DatabaseMetaDataManagerTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/DatabaseMetaDataManagerTest.java
index 988f58fadde..21c29dea498 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/DatabaseMetaDataManagerTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/DatabaseMetaDataManagerTest.java
@@ -158,11 +158,11 @@ class DatabaseMetaDataManagerTest {
ShardingSphereSchema toBeAlteredSchema = createToBeAlteredSchema();
when(metaDataContexts.getMetaData().getDatabase("foo_db").getAllSchemas()).thenReturn(Collections.singleton(toBeAlteredSchema));
when(metaDataContexts.getMetaData().getDatabase("foo_db").getSchema("foo_schema")).thenReturn(toBeAlteredSchema);
- ShardingSphereView toBeChangedView = new
ShardingSphereView("foo_view", "select `foo_view`.`foo_view`.`id` AS `id` from
`foo_view`.`foo_view`");
+ ShardingSphereView toBeChangedView = new
ShardingSphereView("foo_view", "SELECT `foo_view`.`foo_view`.`id` AS `id` FROM
`foo_view`.`foo_view`");
databaseMetaDataManager.alterView("foo_db", "foo_schema",
toBeChangedView);
ShardingSphereView view =
metaDataContexts.getMetaData().getDatabase("foo_db").getSchema("foo_schema").getView("foo_view");
assertThat(view.getName(), is("foo_view"));
- assertThat(view.getViewDefinition(), is("select
`foo_view`.`foo_view`.`id` AS `id` from `foo_view`.`foo_view`"));
+ assertThat(view.getViewDefinition(), is("SELECT
`foo_view`.`foo_view`.`id` AS `id` FROM `foo_view`.`foo_view`"));
}
@Test
diff --git
a/parser/sql/engine/core/src/test/java/org/apache/shardingsphere/sql/parser/engine/core/database/cache/ParseTreeCacheLoaderTest.java
b/parser/sql/engine/core/src/test/java/org/apache/shardingsphere/sql/parser/engine/core/database/cache/ParseTreeCacheLoaderTest.java
index 21349b34fb0..3d0e73a18b5 100644
---
a/parser/sql/engine/core/src/test/java/org/apache/shardingsphere/sql/parser/engine/core/database/cache/ParseTreeCacheLoaderTest.java
+++
b/parser/sql/engine/core/src/test/java/org/apache/shardingsphere/sql/parser/engine/core/database/cache/ParseTreeCacheLoaderTest.java
@@ -31,7 +31,7 @@ import static org.mockito.Mockito.mock;
class ParseTreeCacheLoaderTest {
- private static final String SQL = "select * from user where id=1";
+ private static final String SQL = "SELECT * FROM user WHERE id=1";
@Test
void assertParseTreeCacheLoader() throws ReflectiveOperationException {
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/type/CreateDatabaseProxyBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/type/CreateDatabaseProxyBackendHandlerTest.java
index d657416cd83..2394cb369c9 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/type/CreateDatabaseProxyBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/type/CreateDatabaseProxyBackendHandlerTest.java
@@ -18,8 +18,6 @@
package org.apache.shardingsphere.proxy.backend.handler.database.type;
import
org.apache.shardingsphere.database.exception.core.exception.syntax.database.DatabaseCreateExistsException;
-import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import
org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.database.CreateDatabaseStatement;
@@ -31,13 +29,10 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import java.sql.SQLException;
-import java.util.Collections;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.isA;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ExtendWith(AutoMockExtension.class)
@@ -57,16 +52,12 @@ class CreateDatabaseProxyBackendHandlerTest {
@Test
void assertExecuteCreateNewDatabase() throws SQLException {
when(statement.getDatabaseName()).thenReturn("bar_db");
- ContextManager contextManager = mockContextManager();
-
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
assertThat(handler.execute(), isA(UpdateResponseHeader.class));
}
@Test
void assertExecuteCreateExistDatabase() {
when(statement.getDatabaseName()).thenReturn("foo_db");
- ContextManager contextManager = mockContextManager();
-
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
when(ProxyContext.getInstance().databaseExists("foo_db")).thenReturn(true);
assertThrows(DatabaseCreateExistsException.class, () ->
handler.execute());
}
@@ -75,16 +66,6 @@ class CreateDatabaseProxyBackendHandlerTest {
void assertExecuteCreateExistDatabaseWithIfNotExists() throws SQLException
{
when(statement.getDatabaseName()).thenReturn("foo_db");
when(statement.isIfNotExists()).thenReturn(true);
- ContextManager contextManager = mockContextManager();
-
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
assertThat(handler.execute(), isA(UpdateResponseHeader.class));
}
-
- private ContextManager mockContextManager() {
- ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetaDataContexts metaDataContexts = mock(MetaDataContexts.class,
RETURNS_DEEP_STUBS);
-
when(metaDataContexts.getMetaData().getAllDatabases()).thenReturn(Collections.singleton(mock()));
- when(result.getMetaDataContexts()).thenReturn(metaDataContexts);
- return result;
- }
}
diff --git
a/proxy/backend/dialect/firebird/src/test/java/org/apache/shardingsphere/proxy/backend/firebird/handler/admin/FirebirdAdminExecutorCreatorTest.java
b/proxy/backend/dialect/firebird/src/test/java/org/apache/shardingsphere/proxy/backend/firebird/handler/admin/FirebirdAdminExecutorCreatorTest.java
index 5ee7eca7ad8..6d848c6155f 100644
---
a/proxy/backend/dialect/firebird/src/test/java/org/apache/shardingsphere/proxy/backend/firebird/handler/admin/FirebirdAdminExecutorCreatorTest.java
+++
b/proxy/backend/dialect/firebird/src/test/java/org/apache/shardingsphere/proxy/backend/firebird/handler/admin/FirebirdAdminExecutorCreatorTest.java
@@ -64,7 +64,7 @@ class FirebirdAdminExecutorCreatorTest {
void assertCreateWithSelectNonSystem() {
SelectStatementContext selectStatementContext =
mock(SelectStatementContext.class);
when(selectStatementContext.getSqlStatement()).thenReturn(new
SelectStatement(databaseType));
- assertThat(new
FirebirdAdminExecutorCreator().create(selectStatementContext, "select 1", "",
Collections.emptyList()), is(Optional.empty()));
+ assertThat(new
FirebirdAdminExecutorCreator().create(selectStatementContext, "SELECT 1", "",
Collections.emptyList()), is(Optional.empty()));
}
@Test
@@ -78,6 +78,6 @@ class FirebirdAdminExecutorCreatorTest {
@Test
void assertCreateWithDMLStatement() {
DeleteStatementContext sqlStatementContext = new
DeleteStatementContext(new DeleteStatement(databaseType));
- assertThat(new
FirebirdAdminExecutorCreator().create(sqlStatementContext, "delete from t where
id = 1", "", Collections.emptyList()), is(Optional.empty()));
+ assertThat(new
FirebirdAdminExecutorCreator().create(sqlStatementContext, "DELETE FROM t WHERE
id = 1", "", Collections.emptyList()), is(Optional.empty()));
}
}
diff --git
a/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLAdminExecutorCreatorTest.java
b/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLAdminExecutorCreatorTest.java
index 6d777bed93e..8bc896f59f4 100644
---
a/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLAdminExecutorCreatorTest.java
+++
b/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLAdminExecutorCreatorTest.java
@@ -172,7 +172,7 @@ class MySQLAdminExecutorCreatorTest {
when(projectionsSegment.getProjections()).thenReturn(Collections.singletonList(new
ExpressionProjectionSegment(0, 10, "CONNECTION_ID()")));
when(selectStatement.getProjections()).thenReturn(projectionsSegment);
when(sqlStatementContext.getSqlStatement()).thenReturn(selectStatement);
- Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "select
CONNECTION_ID()", "", Collections.emptyList());
+ Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "SELECT
CONNECTION_ID()", "", Collections.emptyList());
assertTrue(actual.isPresent());
assertThat(actual.get(), isA(ShowConnectionIdExecutor.class));
}
@@ -186,7 +186,7 @@ class MySQLAdminExecutorCreatorTest {
when(projectionsSegment.getProjections()).thenReturn(Collections.singletonList(new
ExpressionProjectionSegment(0, 10, "version()")));
when(selectStatement.getProjections()).thenReturn(projectionsSegment);
when(sqlStatementContext.getSqlStatement()).thenReturn(selectStatement);
- Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "select version()", "",
Collections.emptyList());
+ Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "SELECT version()", "",
Collections.emptyList());
assertTrue(actual.isPresent());
assertThat(actual.get(), isA(ShowVersionExecutor.class));
}
@@ -200,7 +200,7 @@ class MySQLAdminExecutorCreatorTest {
when(projectionsSegment.getProjections()).thenReturn(Collections.singletonList(new
ExpressionProjectionSegment(0, 10, "CURRENT_USER()")));
when(selectStatement.getProjections()).thenReturn(projectionsSegment);
when(sqlStatementContext.getSqlStatement()).thenReturn(selectStatement);
- Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "select
CURRENT_USER()", "", Collections.emptyList());
+ Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "SELECT
CURRENT_USER()", "", Collections.emptyList());
assertTrue(actual.isPresent());
assertThat(actual.get(), isA(ShowCurrentUserExecutor.class));
}
@@ -217,7 +217,7 @@ class MySQLAdminExecutorCreatorTest {
when(selectStatement.getProjections()).thenReturn(projectionsSegment);
SelectStatementContext sqlStatementContext =
mock(SelectStatementContext.class);
when(sqlStatementContext.getSqlStatement()).thenReturn(selectStatement);
- Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "select
@@session.transaction_read_only", "", Collections.emptyList());
+ Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "SELECT
@@session.transaction_read_only", "", Collections.emptyList());
assertTrue(actual.isPresent());
assertThat(actual.get(), isA(MySQLSystemVariableQueryExecutor.class));
}
@@ -233,7 +233,7 @@ class MySQLAdminExecutorCreatorTest {
when(selectStatement.getProjections()).thenReturn(projectionsSegment);
SelectStatementContext sqlStatementContext =
mock(SelectStatementContext.class);
when(sqlStatementContext.getSqlStatement()).thenReturn(selectStatement);
- Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "select
@@session.transaction_isolation", "", Collections.emptyList());
+ Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "SELECT
@@session.transaction_isolation", "", Collections.emptyList());
assertTrue(actual.isPresent());
assertThat(actual.get(), isA(MySQLSystemVariableQueryExecutor.class));
}
@@ -248,7 +248,7 @@ class MySQLAdminExecutorCreatorTest {
when(selectStatement.getProjections()).thenReturn(projectionsSegment);
SelectStatementContext sqlStatementContext =
mock(SelectStatementContext.class);
when(sqlStatementContext.getSqlStatement()).thenReturn(selectStatement);
- Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "select DATABASE()",
"", Collections.emptyList());
+ Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "SELECT DATABASE()",
"", Collections.emptyList());
assertTrue(actual.isPresent());
assertThat(actual.get(), isA(ShowCurrentDatabaseExecutor.class));
}
@@ -263,7 +263,7 @@ class MySQLAdminExecutorCreatorTest {
when(selectStatement.getProjections()).thenReturn(projectionsSegment);
SelectStatementContext sqlStatementContext =
mock(SelectStatementContext.class);
when(sqlStatementContext.getSqlStatement()).thenReturn(selectStatement);
- Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "select DATABASE ()",
"", Collections.emptyList());
+ Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "SELECT DATABASE ()",
"", Collections.emptyList());
assertTrue(actual.isPresent());
assertThat(actual.get(), isA(ShowCurrentDatabaseExecutor.class));
}
@@ -278,7 +278,7 @@ class MySQLAdminExecutorCreatorTest {
when(selectStatement.getProjections()).thenReturn(projectionsSegment);
SelectStatementContext sqlStatementContext =
mock(SelectStatementContext.class);
when(sqlStatementContext.getSqlStatement()).thenReturn(selectStatement);
- Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "select
CURRENT_DATE()", null, Collections.emptyList());
+ Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "SELECT
CURRENT_DATE()", null, Collections.emptyList());
assertTrue(actual.isPresent());
assertThat(actual.get(), isA(NoResourceShowExecutor.class));
}
@@ -297,7 +297,7 @@ class MySQLAdminExecutorCreatorTest {
when(selectStatement.getProjections()).thenReturn(projectionsSegment);
SelectStatementContext sqlStatementContext =
mock(SelectStatementContext.class);
when(sqlStatementContext.getSqlStatement()).thenReturn(selectStatement);
- Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "select
CURRENT_DATE()", "test_db", Collections.emptyList());
+ Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "SELECT
CURRENT_DATE()", "test_db", Collections.emptyList());
assertThat(actual, is(Optional.empty()));
}
@@ -315,7 +315,7 @@ class MySQLAdminExecutorCreatorTest {
when(selectStatement.getProjections()).thenReturn(projectionsSegment);
SelectStatementContext sqlStatementContext =
mock(SelectStatementContext.class);
when(sqlStatementContext.getSqlStatement()).thenReturn(selectStatement);
- Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "select
CURRENT_DATE()", null, Collections.emptyList());
+ Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "SELECT
CURRENT_DATE()", null, Collections.emptyList());
assertTrue(actual.isPresent());
assertThat(actual.get(), isA(UnicastResourceShowExecutor.class));
}
@@ -329,7 +329,7 @@ class MySQLAdminExecutorCreatorTest {
when(selectStatement.getFrom()).thenReturn(Optional.of(tableSegment));
SelectStatementContext sqlStatementContext =
mock(SelectStatementContext.class);
when(sqlStatementContext.getSqlStatement()).thenReturn(selectStatement);
- Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "select ENGINE from
ENGINES", "information_schema", Collections.emptyList());
+ Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "SELECT ENGINE from
ENGINES", "information_schema", Collections.emptyList());
assertTrue(actual.isPresent());
assertThat(actual.get(), isA(DefaultDatabaseMetaDataExecutor.class));
}
@@ -343,11 +343,11 @@ class MySQLAdminExecutorCreatorTest {
when(selectStatement.getFrom()).thenReturn(Optional.of(tableSegment));
SelectStatementContext sqlStatementContext =
mock(SelectStatementContext.class);
when(sqlStatementContext.getSqlStatement()).thenReturn(selectStatement);
- Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "select SCHEMA_NAME
from SCHEMATA", "information_schema", Collections.emptyList());
+ Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "SELECT SCHEMA_NAME
FROM SCHEMATA", "information_schema", Collections.emptyList());
assertTrue(actual.isPresent());
assertThat(actual.get(), isA(SelectInformationSchemataExecutor.class));
when(ProxyContext.getInstance().getContextManager().getDatabase("information_schema").isComplete()).thenReturn(true);
- actual = new MySQLAdminExecutorCreator().create(sqlStatementContext,
"select SCHEMA_NAME from SCHEMATA", "information_schema",
Collections.emptyList());
+ actual = new MySQLAdminExecutorCreator().create(sqlStatementContext,
"SELECT SCHEMA_NAME FROM SCHEMATA", "information_schema",
Collections.emptyList());
assertFalse(actual.isPresent());
}
@@ -360,7 +360,7 @@ class MySQLAdminExecutorCreatorTest {
SelectStatementContext sqlStatementContext =
mock(SelectStatementContext.class);
when(selectStatement.getFrom()).thenReturn(Optional.of(tableSegment));
when(sqlStatementContext.getSqlStatement()).thenReturn(selectStatement);
- Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "select
CHARACTER_SET_NAME from CHARACTER_SETS", "", Collections.emptyList());
+ Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "SELECT
CHARACTER_SET_NAME FROM CHARACTER_SETS", "", Collections.emptyList());
assertFalse(actual.isPresent());
}
@@ -373,7 +373,7 @@ class MySQLAdminExecutorCreatorTest {
when(selectStatement.getFrom()).thenReturn(Optional.of(tableSegment));
SelectStatementContext sqlStatementContext =
mock(SelectStatementContext.class);
when(sqlStatementContext.getSqlStatement()).thenReturn(selectStatement);
- Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "select * from
accounts", "", Collections.emptyList());
+ Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "SELECT * FROM
accounts", "", Collections.emptyList());
assertFalse(actual.isPresent());
}
@@ -388,7 +388,7 @@ class MySQLAdminExecutorCreatorTest {
@Test
void assertCreateWithDMLStatement() {
SQLStatementContext sqlStatementContext = new
CommonSQLStatementContext(new DeleteStatement(databaseType));
- Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "delete from t", "",
Collections.emptyList());
+ Optional<DatabaseAdminExecutor> actual = new
MySQLAdminExecutorCreator().create(sqlStatementContext, "DELETE FROM t", "",
Collections.emptyList());
assertThat(actual, is(Optional.empty()));
}
}
diff --git
a/proxy/backend/dialect/opengauss/src/test/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussAdminExecutorCreatorTest.java
b/proxy/backend/dialect/opengauss/src/test/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussAdminExecutorCreatorTest.java
index 3761385630b..008e688015b 100644
---
a/proxy/backend/dialect/opengauss/src/test/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussAdminExecutorCreatorTest.java
+++
b/proxy/backend/dialect/opengauss/src/test/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussAdminExecutorCreatorTest.java
@@ -60,7 +60,7 @@ class OpenGaussAdminExecutorCreatorTest {
@Test
void assertCreateExecutorForSelectDatCompatibilityFromPgDatabase() {
initDialectDatabaseStatisticsCollector(false);
- String sql = "select datcompatibility from pg_database where
datname='sharding_db'";
+ String sql = "SELECT datcompatibility FROM pg_database WHERE
datname='sharding_db'";
String databaseName = "postgres";
SelectStatementContext selectStatementContext =
mockSelectStatementContext("pg_catalog", "pg_database", "datcompatibility");
Optional<DatabaseAdminExecutor> actual = new
OpenGaussAdminExecutorCreator().create(selectStatementContext, sql,
databaseName, Collections.emptyList());
@@ -71,7 +71,7 @@ class OpenGaussAdminExecutorCreatorTest {
@Test
void assertCreateExecutorForSelectFromCollectedTable() {
initDialectDatabaseStatisticsCollector(true);
- String sql = "select relname from pg_class";
+ String sql = "SELECT relname FROM pg_class";
String databaseName = "postgres";
SelectStatementContext selectStatementContext =
mockSelectStatementContext("pg_catalog", "pg_class", null);
Optional<DatabaseAdminExecutor> actual = new
OpenGaussAdminExecutorCreator().create(selectStatementContext, sql,
databaseName, Collections.emptyList());
@@ -81,7 +81,7 @@ class OpenGaussAdminExecutorCreatorTest {
@Test
void assertCreateExecutorForSelectFromNotCollectedTable() {
initDialectDatabaseStatisticsCollector(false);
- String sql = "select * from pg_type";
+ String sql = "SELECT * FROM pg_type";
SelectStatementContext selectStatementContext =
mockSelectStatementContext("pg_catalog", "pg_type", null);
Optional<DatabaseAdminExecutor> actual = new
OpenGaussAdminExecutorCreator().create(selectStatementContext, sql, "postgres",
Collections.emptyList());
assertTrue(actual.isPresent());
@@ -90,21 +90,21 @@ class OpenGaussAdminExecutorCreatorTest {
@Test
void assertCreateExecutorForSelectVersion() {
- String sql = "select VERSION()";
+ String sql = "SELECT VERSION()";
String expression = "VERSION()";
assertCreateExecutorForFunction(sql, expression,
OpenGaussSelectVersionExecutor.class);
}
@Test
void assertCreateExecutorForSelectGsPasswordDeadline() {
- String sql = "select
pg_catalog.intervaltonum(pg_catalog.gs_password_deadline())";
+ String sql = "SELECT
pg_catalog.intervaltonum(pg_catalog.gs_password_deadline())";
String expression =
"pg_catalog.intervaltonum(pg_catalog.gs_password_deadline())";
assertCreateExecutorForFunction(sql, expression,
OpenGaussSelectPasswordDeadlineExecutor.class);
}
@Test
void assertCreateExecutorForSelectGsPasswordNotifyTime() {
- String sql = "select pg_catalog.gs_password_notifytime()";
+ String sql = "SELECT pg_catalog.gs_password_notifytime()";
String expression = "pg_catalog.gs_password_notifytime()";
assertCreateExecutorForFunction(sql, expression,
OpenGaussSelectPasswordNotifyTimeExecutor.class);
}
diff --git
a/proxy/backend/dialect/opengauss/src/test/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussSystemTableQueryExecutorCreatorTest.java
b/proxy/backend/dialect/opengauss/src/test/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussSystemTableQueryExecutorCreatorTest.java
index e685bf2bdf4..8c5c016d3db 100644
---
a/proxy/backend/dialect/opengauss/src/test/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussSystemTableQueryExecutorCreatorTest.java
+++
b/proxy/backend/dialect/opengauss/src/test/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussSystemTableQueryExecutorCreatorTest.java
@@ -45,7 +45,7 @@ class OpenGaussSystemTableQueryExecutorCreatorTest {
@Test
void assertSelectDatCompatibilityFromPgDatabase() {
- String sql = "select datcompatibility from pg_database where
datname='sharding_db'";
+ String sql = "SELECT datcompatibility FROM pg_database WHERE
datname='sharding_db'";
SQLStatementContext sqlStatementContext =
mockSelectStatementContext("pg_catalog", "pg_database", "datcompatibility");
OpenGaussSystemTableQueryExecutorCreator creator = new
OpenGaussSystemTableQueryExecutorCreator(sqlStatementContext, sql,
Collections.emptyList());
assertTrue(creator.accept());
@@ -56,7 +56,7 @@ class OpenGaussSystemTableQueryExecutorCreatorTest {
@Test
void assertSelectFromNotCollectedTable() {
- String sql = "select name from pg_type'";
+ String sql = "SELECT name FROM pg_type'";
SQLStatementContext sqlStatementContext =
mockSelectStatementContext("pg_catalog", "pg_type", "name");
OpenGaussSystemTableQueryExecutorCreator creator = new
OpenGaussSystemTableQueryExecutorCreator(sqlStatementContext, sql,
Collections.emptyList());
assertTrue(creator.accept());
diff --git
a/proxy/backend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/PostgreSQLAdminExecutorCreatorTest.java
b/proxy/backend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/PostgreSQLAdminExecutorCreatorTest.java
index 8c4fb0603f3..d5bc944adf3 100644
---
a/proxy/backend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/PostgreSQLAdminExecutorCreatorTest.java
+++
b/proxy/backend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/PostgreSQLAdminExecutorCreatorTest.java
@@ -58,11 +58,11 @@ class PostgreSQLAdminExecutorCreatorTest {
private static final String PSQL_SELECT_TABLESPACES = "SELECT spcname AS
\"Name\",pg_catalog.pg_get_userbyid(spcowner) AS
\"Owner\",pg_catalog.pg_tablespace_location(oid) AS \"Location\""
+ " FROM pg_catalog.pg_tablespace ORDER BY 1";
- private static final String SELECT_PG_CATALOG_WITH_SUBQUERY = "select *
from (select * from pg_catalog.pg_namespace) t;";
+ private static final String SELECT_PG_CATALOG_WITH_SUBQUERY = "SELECT *
FROM (SELECT * FROM pg_catalog.pg_namespace) t;";
- private static final String SELECT_PG_CLASS_AND_PG_NAMESPACE = "SELECT
n.nspname as \"Schema\",c.relname as \"Name\","
+ private static final String SELECT_PG_CLASS_AND_PG_NAMESPACE = "SELECT
n.nspname AS \"Schema\",c.relname AS \"Name\","
+ "CASE c.relkind WHEN 'r' THEN 'table' WHEN 'v' THEN 'view' WHEN
'm' THEN 'materialized view' WHEN 'i' THEN 'index' WHEN 'S' THEN 'sequence'
WHEN 's' THEN 'special' "
- + "WHEN 'f' THEN 'foreign table' WHEN 'p' THEN 'partitioned table'
WHEN 'I' THEN 'partitioned index' END as
\"Type\",pg_catalog.pg_get_userbyid(c.relowner) as \"Owner\" "
+ + "WHEN 'f' THEN 'foreign table' WHEN 'p' THEN 'partitioned table'
WHEN 'I' THEN 'partitioned index' END AS
\"Type\",pg_catalog.pg_get_userbyid(c.relowner) AS \"Owner\" "
+ "FROM pg_catalog.pg_class c LEFT JOIN pg_catalog.pg_namespace n
ON n.oid = c.relnamespace WHERE c.relkind IN ('r','p','v','m','S','f','') "
+ "AND n.nspname <> 'pg_catalog' AND n.nspname <>
'information_schema' AND n.nspname !~ '^pg_toast' AND
pg_catalog.pg_table_is_visible(c.oid) ORDER BY 1,2;";
@@ -126,7 +126,7 @@ class PostgreSQLAdminExecutorCreatorTest {
void assertCreateWithSelectNonPgCatalog() {
SelectStatementContext selectStatementContext =
mock(SelectStatementContext.class);
when(selectStatementContext.getSqlStatement()).thenReturn(new
SelectStatement(databaseType));
- assertThat(new
PostgreSQLAdminExecutorCreator().create(selectStatementContext, "select 1", "",
Collections.emptyList()), is(Optional.empty()));
+ assertThat(new
PostgreSQLAdminExecutorCreator().create(selectStatementContext, "SELECT 1", "",
Collections.emptyList()), is(Optional.empty()));
}
@Test
@@ -148,6 +148,6 @@ class PostgreSQLAdminExecutorCreatorTest {
@Test
void assertCreateWithDMLStatement() {
DeleteStatementContext sqlStatementContext = new
DeleteStatementContext(new DeleteStatement(databaseType));
- assertThat(new
PostgreSQLAdminExecutorCreator().create(sqlStatementContext, "delete from t
where id = 1", "", Collections.emptyList()), is(Optional.empty()));
+ assertThat(new
PostgreSQLAdminExecutorCreator().create(sqlStatementContext, "DELETE FROM t
WHERE id = 1", "", Collections.emptyList()), is(Optional.empty()));
}
}
diff --git
a/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandPacketFactoryTest.java
b/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandPacketFactoryTest.java
index 4d1d4f64b51..cc12fdb55a1 100644
---
a/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandPacketFactoryTest.java
+++
b/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandPacketFactoryTest.java
@@ -101,7 +101,7 @@ class MySQLCommandPacketFactoryTest {
ServerPreparedStatementRegistry serverPreparedStatementRegistry = new
ServerPreparedStatementRegistry();
when(connectionSession.getServerPreparedStatementRegistry()).thenReturn(serverPreparedStatementRegistry);
SQLStatementContext sqlStatementContext = new
CommonSQLStatementContext(new SelectStatement(databaseType));
- serverPreparedStatementRegistry.addPreparedStatement(1, new
MySQLServerPreparedStatement("select 1", sqlStatementContext, new
HintValueContext(), Collections.emptyList()));
+ serverPreparedStatementRegistry.addPreparedStatement(1, new
MySQLServerPreparedStatement("SELECT 1", sqlStatementContext, new
HintValueContext(), Collections.emptyList()));
assertThat(MySQLCommandPacketFactory.newInstance(MySQLCommandPacketType.COM_STMT_EXECUTE,
payload, connectionSession), isA(MySQLComStmtExecutePacket.class));
}
diff --git
a/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/MySQLComStmtSendLongDataExecutorTest.java
b/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/MySQLComStmtSendLongDataExecutorTest.java
index 02239860576..c49883fe30a 100644
---
a/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/MySQLComStmtSendLongDataExecutorTest.java
+++
b/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/MySQLComStmtSendLongDataExecutorTest.java
@@ -44,7 +44,7 @@ class MySQLComStmtSendLongDataExecutorTest {
when(packet.getData()).thenReturn(data);
ConnectionSession connectionSession = mock(ConnectionSession.class);
when(connectionSession.getServerPreparedStatementRegistry()).thenReturn(new
ServerPreparedStatementRegistry());
- MySQLServerPreparedStatement preparedStatement = new
MySQLServerPreparedStatement("insert into t (b) values (?)", mock(), new
HintValueContext(), Collections.emptyList());
+ MySQLServerPreparedStatement preparedStatement = new
MySQLServerPreparedStatement("INSERT INTO t (b) VALUES (?)", mock(), new
HintValueContext(), Collections.emptyList());
connectionSession.getServerPreparedStatementRegistry().addPreparedStatement(1,
preparedStatement);
MySQLComStmtSendLongDataExecutor executor = new
MySQLComStmtSendLongDataExecutor(packet, connectionSession);
Collection<DatabasePacket> actual = executor.execute();
diff --git
a/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutorTest.java
b/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutorTest.java
index 794ec9fa9c4..e25158accf0 100644
---
a/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutorTest.java
+++
b/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutorTest.java
@@ -100,7 +100,7 @@ class MySQLComStmtPrepareExecutorTest {
@Test
void assertPrepareMultiStatements() {
- when(packet.getSQL()).thenReturn("update t set v=v+1 where id=1;update
t set v=v+1 where id=2;update t set v=v+1 where id=3");
+ when(packet.getSQL()).thenReturn("UPDATE t SET v=v+1 WHERE id=1;UPDATE
t SET v=v+1 WHERE id=2;UPDATE t SET v=v+1 WHERE id=3");
when(connectionSession.getAttributeMap().hasAttr(MySQLConstants.OPTION_MULTI_STATEMENTS_ATTRIBUTE_KEY)).thenReturn(true);
when(connectionSession.getAttributeMap().attr(MySQLConstants.OPTION_MULTI_STATEMENTS_ATTRIBUTE_KEY).get()).thenReturn(0);
assertThrows(UnsupportedPreparedStatementException.class, () -> new
MySQLComStmtPrepareExecutor(packet, connectionSession).execute());
@@ -108,7 +108,7 @@ class MySQLComStmtPrepareExecutorTest {
@Test
void assertPrepareSelectStatement() {
- String sql = "select name from foo_db.user where id = ?";
+ String sql = "SELECT name FROM foo_db.user WHERE id = ?";
when(packet.getSQL()).thenReturn(sql);
when(packet.getHintValueContext()).thenReturn(new HintValueContext());
when(connectionSession.getConnectionId()).thenReturn(1);
@@ -132,7 +132,7 @@ class MySQLComStmtPrepareExecutorTest {
@Test
void assertPrepareInsertStatement() {
- String sql = "insert into user (id, name, age) values (1, ?, ?), (?,
'bar', ?)";
+ String sql = "INSERT INTO user (id, name, age) VALUES (1, ?, ?), (?,
'bar', ?)";
when(packet.getSQL()).thenReturn(sql);
when(packet.getHintValueContext()).thenReturn(new HintValueContext());
int connectionId = 2;
@@ -193,7 +193,7 @@ class MySQLComStmtPrepareExecutorTest {
@Test
void assertPrepareUpdateStatement() {
- String sql = "update user set name = ?, age = ? where id = ?";
+ String sql = "UPDATE user SET name = ?, age = ? WHERE id = ?";
when(packet.getSQL()).thenReturn(sql);
when(packet.getHintValueContext()).thenReturn(new HintValueContext());
when(connectionSession.getConnectionId()).thenReturn(1);
diff --git
a/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutorTest.java
b/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutorTest.java
index f7a1f0215fa..aca0fb55082 100644
---
a/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutorTest.java
+++
b/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutorTest.java
@@ -123,7 +123,7 @@ class MySQLComQueryPacketExecutorTest {
when(connectionSession.getAttributeMap().hasAttr(MySQLConstants.OPTION_MULTI_STATEMENTS_ATTRIBUTE_KEY)).thenReturn(true);
when(connectionSession.getAttributeMap().attr(MySQLConstants.OPTION_MULTI_STATEMENTS_ATTRIBUTE_KEY).get()).thenReturn(0);
when(connectionSession.getCurrentDatabaseName()).thenReturn("foo_db");
- when(packet.getSQL()).thenReturn("update t set v=v+1 where id=1;update
t set v=v+1 where id=2;update t set v=v+1 where id=3");
+ when(packet.getSQL()).thenReturn("UPDATE t SET v=v+1 WHERE id=1;UPDATE
t SET v=v+1 WHERE id=2;UPDATE t SET v=v+1 WHERE id=3");
ContextManager contextManager = mock(ContextManager.class);
MetaDataContexts metaDataContexts = mockMetaDataContexts();
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
@@ -141,7 +141,7 @@ class MySQLComQueryPacketExecutorTest {
when(connectionSession.getAttributeMap().hasAttr(MySQLConstants.OPTION_MULTI_STATEMENTS_ATTRIBUTE_KEY)).thenReturn(true);
when(connectionSession.getAttributeMap().attr(MySQLConstants.OPTION_MULTI_STATEMENTS_ATTRIBUTE_KEY).get()).thenReturn(0);
when(connectionSession.getCurrentDatabaseName()).thenReturn("foo_db");
- when(packet.getSQL()).thenReturn("insert into t (id, v) values(1,1) on
duplicate key update v=2;insert into t (id, v) values(2,1) on duplicate key
update v=3");
+ when(packet.getSQL()).thenReturn("INSERT INTO t (id, v) VALUES(1,1) ON
DUPLICATE KEY UPDATE v=2;INSERT INTO t (id, v) VALUES(2,1) ON DUPLICATE KEY
UPDATE v=3");
ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
MetaDataContexts metaDataContexts = mockMetaDataContexts();
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
diff --git
a/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsProxyBackendHandlerTest.java
b/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsProxyBackendHandlerTest.java
index 260af69b4f4..1e2a12c66db 100644
---
a/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsProxyBackendHandlerTest.java
+++
b/proxy/frontend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLMultiStatementsProxyBackendHandlerTest.java
@@ -73,7 +73,7 @@ class MySQLMultiStatementsProxyBackendHandlerTest {
@Test
void assertExecute() throws SQLException {
- String sql = "update t set v=v+1 where id=1;update t set v=v+1 where
id=2;update t set v=v+1 where id=3";
+ String sql = "UPDATE t SET v=v+1 WHERE id=1;UPDATE t SET v=v+1 WHERE
id=2;UPDATE t SET v=v+1 WHERE id=3";
ConnectionSession connectionSession = mockConnectionSession();
UpdateStatement expectedStatement = mock(UpdateStatement.class);
ContextManager contextManager = mockContextManager();
@@ -99,7 +99,7 @@ class MySQLMultiStatementsProxyBackendHandlerTest {
@Test
void assertExecuteWithSpecifiedDatabaseName() throws SQLException {
- String sql = "update foo_db.t set v=v+1 where id=1;update foo_db.t set
v=v+1 where id=2;update foo_db.t set v=v+1 where id=3";
+ String sql = "UPDATE foo_db.t SET v=v+1 WHERE id=1;UPDATE foo_db.t SET
v=v+1 WHERE id=2;UPDATE foo_db.t SET v=v+1 WHERE id=3";
ConnectionSession connectionSession = mockConnectionSession();
UpdateStatement expectedStatement = mock(UpdateStatement.class);
ContextManager contextManager = mockContextManager();
@@ -125,9 +125,8 @@ class MySQLMultiStatementsProxyBackendHandlerTest {
@Test
void assertExecuteWithMultiInsertOnDuplicateKey() throws SQLException {
- String sql =
- "insert into t (id, v) values(1,1) on duplicate key update
v=2;insert into t (id, v) values(2,1) "
- + "on duplicate key update v=3;insert into t (id, v)
values(2,1) on duplicate key update v=3";
+ String sql = "INSERT INTO t (id, v) VALUES(1,1) ON DUPLICATE KEY
UPDATE v=2;"
+ + "INSERT INTO t (id, v) VALUES(2,1) ON DUPLICATE KEY UPDATE
v=3;INSERT INTO t (id, v) VALUES(2,1) ON DUPLICATE KEY UPDATE v=3";
ConnectionSession connectionSession = mockConnectionSession();
UpdateStatement expectedStatement = mock(UpdateStatement.class);
ContextManager contextManager = mockContextManager();
diff --git
a/proxy/frontend/dialect/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/extended/bind/OpenGaussComBatchBindExecutorTest.java
b/proxy/frontend/dialect/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/extended/bind/OpenGaussComBatchBindExecutorTest.java
index a14ee6e83c9..c2e78bb36f6 100644
---
a/proxy/frontend/dialect/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/extended/bind/OpenGaussComBatchBindExecutorTest.java
+++
b/proxy/frontend/dialect/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/extended/bind/OpenGaussComBatchBindExecutorTest.java
@@ -83,7 +83,7 @@ class OpenGaussComBatchBindExecutorTest {
@Test
void assertExecute() throws SQLException {
String statement = "S_1";
- String sql = "insert into bmsql (id) values (?)";
+ String sql = "INSERT INTO bmsql (id) VALUES (?)";
SQLStatement sqlStatement = parserEngine.parse(sql, false);
SQLStatementContext sqlStatementContext =
mock(InsertStatementContext.class);
when(sqlStatementContext.getSqlStatement()).thenReturn(sqlStatement);
diff --git
a/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PortalTest.java
b/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PortalTest.java
index 336b3a77433..2caa85cc5ca 100644
---
a/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PortalTest.java
+++
b/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PortalTest.java
@@ -219,7 +219,7 @@ class PortalTest {
when(insertStatementContext.getTablesContext().getDatabaseName()).thenReturn(Optional.empty());
PostgreSQLServerPreparedStatement preparedStatement = new
PostgreSQLServerPreparedStatement("", insertStatementContext, new
HintValueContext(), Collections.emptyList(),
Collections.emptyList());
- Portal portal = new Portal("insert into t values (1)",
preparedStatement, Collections.emptyList(), Collections.emptyList(),
databaseConnectionManager);
+ Portal portal = new Portal("INSERT INTO t VALUES (1)",
preparedStatement, Collections.emptyList(), Collections.emptyList(),
databaseConnectionManager);
portal.bind();
assertThat(portal.describe(),
is(PostgreSQLNoDataPacket.getInstance()));
List<DatabasePacket> actualPackets = portal.execute(0);
diff --git
a/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java
b/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java
index 582eebebba4..a928d22688c 100644
---
a/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java
+++
b/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java
@@ -99,7 +99,7 @@ class PostgreSQLBatchedStatementsExecutorTest {
.thenReturn(preparedStatement);
ContextManager contextManager = mockContextManager();
ConnectionSession connectionSession = mockConnectionSession();
- PostgreSQLServerPreparedStatement postgresqlPreparedStatement = new
PostgreSQLServerPreparedStatement("insert into t (id, col) values (?, ?)",
mockInsertStatementContext(),
+ PostgreSQLServerPreparedStatement postgresqlPreparedStatement = new
PostgreSQLServerPreparedStatement("INSERT INTO t (id, col) VALUES (?, ?)",
mockInsertStatementContext(),
new HintValueContext(),
Arrays.asList(PostgreSQLColumnType.INT4, PostgreSQLColumnType.VARCHAR),
Arrays.asList(0, 1));
List<List<Object>> parameterSets = Arrays.asList(Arrays.asList(1, new
PostgreSQLTypeUnspecifiedSQLParameter("foo")),
Arrays.asList(2, new
PostgreSQLTypeUnspecifiedSQLParameter("bar")), Arrays.asList(3, new
PostgreSQLTypeUnspecifiedSQLParameter("baz")));
diff --git
a/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/bind/PostgreSQLComBindExecutorTest.java
b/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/bind/PostgreSQLComBindExecutorTest.java
index 8370d5d0773..5e421c4d6bf 100644
---
a/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/bind/PostgreSQLComBindExecutorTest.java
+++
b/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/bind/PostgreSQLComBindExecutorTest.java
@@ -127,7 +127,7 @@ class PostgreSQLComBindExecutorTest {
when(connectionSession.getConnectionContext()).thenReturn(connectionContext);
String statementId = "S_1";
List<Object> parameters = Arrays.asList(1, "updated_name");
- PostgreSQLServerPreparedStatement serverPreparedStatement = new
PostgreSQLServerPreparedStatement("update test set name = $2 where id = $1",
+ PostgreSQLServerPreparedStatement serverPreparedStatement = new
PostgreSQLServerPreparedStatement("UPDATE test SET name = $2 WHERE id = $1",
new CommonSQLStatementContext(new
EmptyStatement(databaseType)), new HintValueContext(),
Arrays.asList(PostgreSQLColumnType.VARCHAR,
PostgreSQLColumnType.INT4), Arrays.asList(1, 0));
connectionSession.getServerPreparedStatementRegistry().addPreparedStatement(statementId,
serverPreparedStatement);
diff --git
a/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutorTest.java
b/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutorTest.java
index 399396343a4..3591fc31eb3 100644
---
a/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutorTest.java
+++
b/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutorTest.java
@@ -138,7 +138,7 @@ class PostgreSQLComDescribeExecutorTest {
when(packet.getType()).thenReturn('S');
final String statementId = "S_1";
when(packet.getName()).thenReturn(statementId);
- String sql = "insert into t_order values (?, 0, 'char', ?), (2, ?, ?,
'')";
+ String sql = "INSERT INTO t_order VALUES (?, 0, 'char', ?), (2, ?, ?,
'')";
SQLStatement sqlStatement = SQL_PARSER_ENGINE.parse(sql, false);
List<PostgreSQLColumnType> parameterTypes = new
ArrayList<>(sqlStatement.getParameterCount());
for (int i = 0; i < sqlStatement.getParameterCount(); i++) {
@@ -168,7 +168,7 @@ class PostgreSQLComDescribeExecutorTest {
when(packet.getType()).thenReturn('S');
final String statementId = "S_2";
when(packet.getName()).thenReturn(statementId);
- String sql = "insert into t_order (id, k, c, pad) values (1, ?, ?, ?),
(?, 2, ?, '')";
+ String sql = "INSERT INTO t_order (id, k, c, pad) VALUES (1, ?, ?, ?),
(?, 2, ?, '')";
SQLStatement sqlStatement = SQL_PARSER_ENGINE.parse(sql, false);
List<PostgreSQLColumnType> parameterTypes = new
ArrayList<>(sqlStatement.getParameterCount());
for (int i = 0; i < sqlStatement.getParameterCount(); i++) {
@@ -198,7 +198,7 @@ class PostgreSQLComDescribeExecutorTest {
when(packet.getType()).thenReturn('S');
final String statementId = "S_2";
when(packet.getName()).thenReturn(statementId);
- String sql = "insert into t_order (iD, k, c, PaD) values (1, ?, ?, ?),
(?, 2, ?, '')";
+ String sql = "INSERT INTO t_order (iD, k, c, PaD) VALUES (1, ?, ?, ?),
(?, 2, ?, '')";
SQLStatement sqlStatement = SQL_PARSER_ENGINE.parse(sql, false);
List<PostgreSQLColumnType> parameterTypes = new
ArrayList<>(sqlStatement.getParameterCount());
for (int i = 0; i < sqlStatement.getParameterCount(); i++) {
@@ -228,7 +228,7 @@ class PostgreSQLComDescribeExecutorTest {
when(packet.getType()).thenReturn('S');
final String statementId = "S_2";
when(packet.getName()).thenReturn(statementId);
- String sql = "insert into t_order (undefined_column, k, c, pad) values
(1, ?, ?, ?), (?, 2, ?, '')";
+ String sql = "INSERT INTO t_order (undefined_column, k, c, pad) VALUES
(1, ?, ?, ?), (?, 2, ?, '')";
SQLStatement sqlStatement = SQL_PARSER_ENGINE.parse(sql, false);
List<PostgreSQLColumnType> parameterTypes = new
ArrayList<>(sqlStatement.getParameterCount());
for (int i = 0; i < sqlStatement.getParameterCount(); i++) {
@@ -249,8 +249,8 @@ class PostgreSQLComDescribeExecutorTest {
when(packet.getType()).thenReturn('S');
final String statementId = "S_2";
when(packet.getName()).thenReturn(statementId);
- String sql = "insert into t_order (k, c, pad) values (?, ?, ?) "
- + "returning id, id alias_id, 'anonymous', 'OK'
literal_string, 1 literal_int, 4294967296 literal_bigint, 1.1 literal_numeric,
t_order.*, t_order, t_order alias_t_order";
+ String sql = "INSERT INTO t_order (k, c, pad) VALUES (?, ?, ?) "
+ + "RETURNING id, id alias_id, 'anonymous', 'OK'
literal_string, 1 literal_int, 4294967296 literal_bigint, 1.1 literal_numeric,
t_order.*, t_order, t_order alias_t_order";
SQLStatement sqlStatement = SQL_PARSER_ENGINE.parse(sql, false);
List<PostgreSQLColumnType> parameterTypes = new
ArrayList<>(sqlStatement.getParameterCount());
for (int i = 0; i < sqlStatement.getParameterCount(); i++) {
@@ -332,7 +332,7 @@ class PostgreSQLComDescribeExecutorTest {
when(packet.getType()).thenReturn('S');
String statementId = "S_3";
when(packet.getName()).thenReturn(statementId);
- String sql = "select id, k, c, pad from t_order where id = ?";
+ String sql = "SELECT id, k, c, pad FROM t_order WHERE id = ?";
SQLStatement sqlStatement = SQL_PARSER_ENGINE.parse(sql, false);
SQLStatementContext sqlStatementContext =
mock(SelectStatementContext.class);
when(sqlStatementContext.getSqlStatement()).thenReturn(sqlStatement);
diff --git
a/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutorTest.java
b/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutorTest.java
index 422cea54921..8416f2c7123 100644
---
a/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutorTest.java
+++
b/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutorTest.java
@@ -133,8 +133,8 @@ class PostgreSQLComParseExecutorTest {
@Test
void assertExecuteWithNonOrderedParameterizedSQL() throws
ReflectiveOperationException {
- final String rawSQL = "update t_test set name=$2 where id=$1";
- final String expectedSQL = "update t_test set name=? where id=?";
+ final String rawSQL = "UPDATE t_test SET name=$2 WHERE id=$1";
+ final String expectedSQL = "UPDATE t_test SET name=? WHERE id=?";
final String statementId = "S_2";
when(parsePacket.getSQL()).thenReturn(rawSQL);
when(parsePacket.getHintValueContext()).thenReturn(new
HintValueContext());
@@ -152,8 +152,8 @@ class PostgreSQLComParseExecutorTest {
@Test
void assertExecuteWithQuestionOperator() throws
ReflectiveOperationException {
- final String rawSQL = "update t_test set enabled = $1 where name ?&
$2";
- final String expectedSQL = "update t_test set enabled = ? where name
??& ?";
+ final String rawSQL = "UPDATE t_test SET enabled = $1 WHERE name ?&
$2";
+ final String expectedSQL = "UPDATE t_test SET enabled = ? WHERE name
??& ?";
final String statementId = "S_2";
when(parsePacket.getSQL()).thenReturn(rawSQL);
when(parsePacket.getStatementId()).thenReturn(statementId);
diff --git
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/engine/ShowProcessListE2EIT.java
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/engine/ShowProcessListE2EIT.java
index b2322ce9348..db8fe200a6d 100644
---
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/engine/ShowProcessListE2EIT.java
+++
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/engine/ShowProcessListE2EIT.java
@@ -53,7 +53,7 @@ class ShowProcessListE2EIT {
private static final E2ETestEnvironment ENV =
E2ETestEnvironment.getInstance();
- private static final String SELECT_SLEEP = "select sleep(10)";
+ private static final String SELECT_SLEEP = "SELECT sleep(10)";
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/alterresource/AddResourceTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/alterresource/AddResourceTestCase.java
index 26241334389..27b36e9b41f 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/alterresource/AddResourceTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/alterresource/AddResourceTestCase.java
@@ -69,7 +69,7 @@ public final class AddResourceTestCase extends
BaseTransactionTestCase {
try (Connection connection = getDataSource().getConnection()) {
connection.setAutoCommit(false);
assertTableRowCount(connection, TransactionTestConstants.ACCOUNT,
0);
- executeWithLog(connection, "insert into account(id, balance,
transaction_id) values(1, 1, 1),(2, 2, 2),(3, 3, 3),(4, 4, 4),(5, 5, 5),(6, 6,
6);");
+ executeWithLog(connection, "INSERT INTO account(id, balance,
transaction_id) VALUES(1, 1, 1),(2, 2, 2),(3, 3, 3),(4, 4, 4),(5, 5, 5),(6, 6,
6);");
assertTableRowCount(connection, TransactionTestConstants.ACCOUNT,
6);
connection.rollback();
assertTableRowCount(connection, TransactionTestConstants.ACCOUNT,
0);
@@ -80,7 +80,7 @@ public final class AddResourceTestCase extends
BaseTransactionTestCase {
try (Connection connection = getDataSource().getConnection()) {
connection.setAutoCommit(false);
assertTableRowCount(connection, TransactionTestConstants.ACCOUNT,
0);
- executeWithLog(connection, "insert into account(id, balance,
transaction_id) values(1, 1, 1),(2, 2, 2),(3, 3, 3),(4, 4, 4),(5, 5, 5),(6, 6,
6);");
+ executeWithLog(connection, "INSERT INTO account(id, balance,
transaction_id) VALUES(1, 1, 1),(2, 2, 2),(3, 3, 3),(4, 4, 4),(5, 5, 5),(6, 6,
6);");
assertTableRowCount(connection, TransactionTestConstants.ACCOUNT,
6);
connection.commit();
assertTableRowCount(connection, TransactionTestConstants.ACCOUNT,
6);
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/alterresource/CloseResourceTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/alterresource/CloseResourceTestCase.java
index 642b02292af..88a36d09cc2 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/alterresource/CloseResourceTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/alterresource/CloseResourceTestCase.java
@@ -58,7 +58,7 @@ public final class CloseResourceTestCase extends
BaseTransactionTestCase {
try (Connection connection = getDataSource().getConnection()) {
connection.setAutoCommit(false);
assertTableRowCount(connection, TransactionTestConstants.ACCOUNT,
0);
- executeWithLog(connection, "insert into account(id, balance,
transaction_id) values(1, 1, 1),(2, 2, 2),(3, 3, 3),(4, 4, 4),(5, 5, 5),(6, 6,
6);");
+ executeWithLog(connection, "INSERT INTO account(id, balance,
transaction_id) VALUES(1, 1, 1),(2, 2, 2),(3, 3, 3),(4, 4, 4),(5, 5, 5),(6, 6,
6);");
assertTableRowCount(connection, TransactionTestConstants.ACCOUNT,
6);
connection.rollback();
assertTableRowCount(connection, TransactionTestConstants.ACCOUNT,
0);
@@ -69,7 +69,7 @@ public final class CloseResourceTestCase extends
BaseTransactionTestCase {
try (Connection connection = getDataSource().getConnection()) {
connection.setAutoCommit(false);
assertTableRowCount(connection, TransactionTestConstants.ACCOUNT,
0);
- executeWithLog(connection, "insert into account(id, balance,
transaction_id) values(1, 1, 1),(2, 2, 2),(3, 3, 3),(4, 4, 4),(5, 5, 5),(6, 6,
6);");
+ executeWithLog(connection, "INSERT INTO account(id, balance,
transaction_id) VALUES(1, 1, 1),(2, 2, 2),(3, 3, 3),(4, 4, 4),(5, 5, 5),(6, 6,
6);");
assertTableRowCount(connection, TransactionTestConstants.ACCOUNT,
6);
connection.commit();
assertTableRowCount(connection, TransactionTestConstants.ACCOUNT,
6);
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/alterresource/SwitchingTransactionRuleTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/alterresource/SwitchingTransactionRuleTestCase.java
index a80b17a85aa..b13e3ac37af 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/alterresource/SwitchingTransactionRuleTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/alterresource/SwitchingTransactionRuleTestCase.java
@@ -207,18 +207,18 @@ public final class SwitchingTransactionRuleTestCase
extends BaseTransactionTestC
try {
connection.setAutoCommit(false);
int id = ID_COUNTER.incrementAndGet();
- PreparedStatement insertStatement =
connection.prepareStatement("insert into account(id, balance, transaction_id)
values(?, ?, ?)");
+ PreparedStatement insertStatement =
connection.prepareStatement("INSERT INTO account(id, balance, transaction_id)
VALUES(?, ?, ?)");
insertStatement.setObject(1, id);
insertStatement.setObject(2, id);
insertStatement.setObject(3, id);
insertStatement.execute();
- PreparedStatement updateStatement =
connection.prepareStatement("update account set balance = balance - 1 where id
= ?");
+ PreparedStatement updateStatement =
connection.prepareStatement("UPDATE account SET balance = balance - 1 WHERE id
= ?");
updateStatement.setObject(1, id);
updateStatement.execute();
- PreparedStatement selectStatement =
connection.prepareStatement("select * from account where id = ?");
+ PreparedStatement selectStatement =
connection.prepareStatement("SELECT * FROM account WHERE id = ?");
selectStatement.setObject(1, id);
selectStatement.executeQuery();
- PreparedStatement deleteStatement =
connection.prepareStatement("delete from account where id = ?");
+ PreparedStatement deleteStatement =
connection.prepareStatement("DELETE FROM account WHERE id = ?");
deleteStatement.setObject(1, id);
deleteStatement.execute();
long time = random.nextLong(900) + 100;
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/autocommit/MySQLAutoCommitTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/autocommit/MySQLAutoCommitTestCase.java
index cafcc0abb58..db6fca6858a 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/autocommit/MySQLAutoCommitTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/autocommit/MySQLAutoCommitTestCase.java
@@ -77,15 +77,15 @@ public final class MySQLAutoCommitTestCase extends
AutoCommitTestCase {
try (
Connection connection1 = getDataSource().getConnection();
Connection connection2 = getDataSource().getConnection()) {
- executeWithLog(connection1, "set session transaction isolation
level read committed;");
- executeWithLog(connection2, "set session transaction isolation
level read committed;");
+ executeWithLog(connection1, "SET session transaction isolation
level read committed;");
+ executeWithLog(connection2, "SET session transaction isolation
level read committed;");
connection1.setAutoCommit(false);
connection2.setAutoCommit(false);
- executeWithLog(connection1, "insert into account(id, balance,
transaction_id) values(1, 100, 1);");
- assertFalse(executeQueryWithLog(connection2, "select * from
account;").next());
+ executeWithLog(connection1, "INSERT INTO account(id, balance,
transaction_id) VALUES(1, 100, 1);");
+ assertFalse(executeQueryWithLog(connection2, "SELECT * FROM
account;").next());
connection1.commit();
- Awaitility.await().atMost(1L, TimeUnit.SECONDS).pollDelay(200L,
TimeUnit.MILLISECONDS).until(() -> executeQueryWithLog(connection2, "select *
from account;").next());
- assertTrue(executeQueryWithLog(connection2, "select * from
account;").next());
+ Awaitility.await().atMost(1L, TimeUnit.SECONDS).pollDelay(200L,
TimeUnit.MILLISECONDS).until(() -> executeQueryWithLog(connection2, "SELECT *
FROM account;").next());
+ assertTrue(executeQueryWithLog(connection2, "SELECT * FROM
account;").next());
}
}
}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/autocommit/PostgreSQLAutoCommitTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/autocommit/PostgreSQLAutoCommitTestCase.java
index 79dcd2e331a..e18b52ff5e5 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/autocommit/PostgreSQLAutoCommitTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/autocommit/PostgreSQLAutoCommitTestCase.java
@@ -52,16 +52,16 @@ public final class PostgreSQLAutoCommitTestCase extends
AutoCommitTestCase {
private void assertAutoCommit() throws SQLException {
try (Connection connection1 = getDataSource().getConnection();
Connection connection2 = getDataSource().getConnection()) {
- executeWithLog(connection1, "set transaction isolation level read
committed;");
- executeWithLog(connection2, "set transaction isolation level read
committed;");
+ executeWithLog(connection1, "SET transaction isolation level read
committed;");
+ executeWithLog(connection2, "SET transaction isolation level read
committed;");
connection1.setAutoCommit(false);
connection2.setAutoCommit(false);
- executeWithLog(connection1, "insert into account(id, balance,
transaction_id) values(1, 100, 1);");
- assertFalse(executeQueryWithLog(connection2, "select * from
account;").next());
+ executeWithLog(connection1, "INSERT INTO account(id, balance,
transaction_id) VALUES(1, 100, 1);");
+ assertFalse(executeQueryWithLog(connection2, "SELECT * FROM
account;").next());
connection1.commit();
Awaitility.await().atMost(1L, TimeUnit.SECONDS).pollDelay(200L,
TimeUnit.MILLISECONDS).until(
- () -> executeQueryWithLog(connection2, "select * from
account;").next());
- assertTrue(executeQueryWithLog(connection2, "select * from
account;").next());
+ () -> executeQueryWithLog(connection2, "SELECT * FROM
account;").next());
+ assertTrue(executeQueryWithLog(connection2, "SELECT * FROM
account;").next());
}
}
}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/base/BaseTransactionTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/base/BaseTransactionTestCase.java
index 63bae1337c9..abcdecff9f6 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/base/BaseTransactionTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/base/BaseTransactionTestCase.java
@@ -62,9 +62,9 @@ public abstract class BaseTransactionTestCase {
protected void beforeTest() throws SQLException {
try (Connection connection = getDataSource().getConnection()) {
connection.setAutoCommit(false);
- executeWithLog(connection, "delete from account;");
- executeWithLog(connection, "delete from t_order;");
- executeWithLog(connection, "delete from t_order_item;");
+ executeWithLog(connection, "DELETE FROM account;");
+ executeWithLog(connection, "DELETE FROM t_order;");
+ executeWithLog(connection, "DELETE FROM t_order_item;");
connection.commit();
}
}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/classictransfer/ClassicTransferTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/classictransfer/ClassicTransferTestCase.java
index 004c5880bf1..a430b3c84c8 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/classictransfer/ClassicTransferTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/classictransfer/ClassicTransferTestCase.java
@@ -50,7 +50,7 @@ public final class ClassicTransferTestCase extends
BaseTransactionTestCase {
@Override
public void executeTest(final TransactionContainerComposer
containerComposer) throws SQLException {
try (Connection connection = getDataSource().getConnection()) {
- executeUpdateWithLog(connection, "insert into
account(transaction_id, balance) values (1,0), (2,100);");
+ executeUpdateWithLog(connection, "INSERT INTO
account(transaction_id, balance) VALUES (1,0), (2,100);");
}
innerRun();
}
@@ -79,7 +79,7 @@ public final class ClassicTransferTestCase extends
BaseTransactionTestCase {
Connection connection = getDataSource().getConnection();
Statement statement = connection.createStatement()) {
connection.setAutoCommit(false);
- ResultSet resultSet = statement.executeQuery("select sum(balance)
as a from account where transaction_id in (1, 2)");
+ ResultSet resultSet = statement.executeQuery("SELECT SUM(balance)
AS a FROM account WHERE transaction_id IN (1, 2)");
if (resultSet.next()) {
result = resultSet.getInt(1);
}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/commitrollback/BroadcastTableTransactionTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/commitrollback/BroadcastTableTransactionTestCase.java
index 52a56f00ae1..561e9f2d50e 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/commitrollback/BroadcastTableTransactionTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/commitrollback/BroadcastTableTransactionTestCase.java
@@ -58,7 +58,7 @@ public final class BroadcastTableTransactionTestCase extends
BaseTransactionTest
private void init() throws SQLException {
try (Connection connection = getDataSource().getConnection()) {
- executeWithLog(connection, "delete from t_address;");
+ executeWithLog(connection, "DELETE FROM t_address;");
assertTableRowCount(connection, T_ADDRESS, 0);
}
}
@@ -66,7 +66,7 @@ public final class BroadcastTableTransactionTestCase extends
BaseTransactionTest
private void commit() throws SQLException {
try (Connection connection = getDataSource().getConnection()) {
connection.setAutoCommit(false);
- executeWithLog(connection, "delete from t_address;");
+ executeWithLog(connection, "DELETE FROM t_address;");
assertTableRowCount(connection, T_ADDRESS, 0);
executeWithLog(connection, "INSERT INTO t_address (id, code,
address) VALUES (1, '1', 'nanjing');");
assertTableRowCount(connection, T_ADDRESS, 1);
@@ -77,7 +77,7 @@ public final class BroadcastTableTransactionTestCase extends
BaseTransactionTest
private void rollback() throws SQLException {
try (Connection connection = getDataSource().getConnection()) {
connection.setAutoCommit(false);
- executeWithLog(connection, "delete from t_address;");
+ executeWithLog(connection, "DELETE FROM t_address;");
assertTableRowCount(connection, T_ADDRESS, 0);
executeWithLog(connection, "INSERT INTO t_address (id, code,
address) VALUES (1, '1', 'nanjing');");
assertTableRowCount(connection, T_ADDRESS, 1);
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/commitrollback/ExceptionInTransactionTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/commitrollback/ExceptionInTransactionTestCase.java
index 98ef1ae2efe..11ec17ff062 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/commitrollback/ExceptionInTransactionTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/commitrollback/ExceptionInTransactionTestCase.java
@@ -48,10 +48,10 @@ public final class ExceptionInTransactionTestCase extends
BaseTransactionTestCas
connection = getDataSource().getConnection();
connection.setAutoCommit(false);
assertAccountRowCount(connection, 0);
- executeWithLog(connection, "insert into account(id, balance,
transaction_id) values(1, 1, 1);");
+ executeWithLog(connection, "INSERT INTO account(id, balance,
transaction_id) VALUES(1, 1, 1);");
int causedExceptionResult = 1 / 0;
log.info("Caused exception result: {}", causedExceptionResult);
- executeWithLog(connection, "insert into account(id, balance,
transaction_id) values(2, 2, 2);");
+ executeWithLog(connection, "INSERT INTO account(id, balance,
transaction_id) VALUES(2, 2, 2);");
connection.commit();
fail("It should fail here.");
} catch (final ArithmeticException ex) {
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/commitrollback/MultiJDBCConnectionsTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/commitrollback/MultiJDBCConnectionsTestCase.java
index 6710c747cc5..d807c484522 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/commitrollback/MultiJDBCConnectionsTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/commitrollback/MultiJDBCConnectionsTestCase.java
@@ -40,14 +40,14 @@ public final class MultiJDBCConnectionsTestCase extends
BaseTransactionTestCase
@Override
public void executeTest(final TransactionContainerComposer
containerComposer) throws SQLException {
try (Connection connection = getDataSource().getConnection()) {
- PreparedStatement statement = connection.prepareStatement("insert
into account(id, balance, transaction_id) values(?, ?, ?)");
+ PreparedStatement statement = connection.prepareStatement("INSERT
INTO account(id, balance, transaction_id) VALUES(?, ?, ?)");
connection.setAutoCommit(false);
statement.setLong(1, 1L);
statement.setFloat(2, 1F);
statement.setInt(3, 1);
statement.execute();
try (Connection connection2 = getDataSource().getConnection()) {
- connection2.createStatement().executeQuery("select * from
account");
+ connection2.createStatement().executeQuery("SELECT * FROM
account");
}
connection.commit();
assertAccountRowCount(connection, 1);
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/commitrollback/MultiTransactionInConnectionTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/commitrollback/MultiTransactionInConnectionTestCase.java
index 5c74cc55bb0..acf6e15849f 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/commitrollback/MultiTransactionInConnectionTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/commitrollback/MultiTransactionInConnectionTestCase.java
@@ -38,7 +38,7 @@ public final class MultiTransactionInConnectionTestCase
extends BaseTransactionT
@Override
public void executeTest(final TransactionContainerComposer
containerComposer) throws SQLException {
try (Connection connection = getDataSource().getConnection()) {
- PreparedStatement statement = connection.prepareStatement("insert
into account(id, balance, transaction_id) values(?, ?, ?)");
+ PreparedStatement statement = connection.prepareStatement("INSERT
INTO account(id, balance, transaction_id) VALUES(?, ?, ?)");
for (int i = 0; i < 8; i++) {
connection.setAutoCommit(false);
statement.setLong(1, i);
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/commitrollback/SingleTableCommitAndRollbackTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/commitrollback/SingleTableCommitAndRollbackTestCase.java
index d7501dd0248..cc152f17cab 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/commitrollback/SingleTableCommitAndRollbackTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/commitrollback/SingleTableCommitAndRollbackTestCase.java
@@ -46,7 +46,7 @@ public final class SingleTableCommitAndRollbackTestCase
extends BaseTransactionT
connection.setAutoCommit(false);
assertAccountRowCount(connection, 0);
Statement statement = connection.createStatement();
- statement.execute("insert into account(id, balance,
transaction_id) values(1, 1, 1);");
+ statement.execute("INSERT INTO account(id, balance,
transaction_id) VALUES(1, 1, 1);");
assertAccountRowCount(connection, 1);
connection.rollback();
assertAccountRowCount(connection, 0);
@@ -58,7 +58,7 @@ public final class SingleTableCommitAndRollbackTestCase
extends BaseTransactionT
connection.setAutoCommit(false);
assertAccountRowCount(connection, 0);
Statement statement = connection.createStatement();
- statement.execute("insert into account(id, balance,
transaction_id) values(1, 1, 1);");
+ statement.execute("INSERT INTO account(id, balance,
transaction_id) VALUES(1, 1, 1);");
assertAccountRowCount(connection, 1);
connection.commit();
assertAccountRowCount(connection, 1);
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/readonly/PostgreSQLSetReadOnlyTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/readonly/PostgreSQLSetReadOnlyTestCase.java
index f83ee7ef557..251495d5e0c 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/readonly/PostgreSQLSetReadOnlyTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/readonly/PostgreSQLSetReadOnlyTestCase.java
@@ -44,12 +44,12 @@ public final class PostgreSQLSetReadOnlyTestCase extends
SetReadOnlyTestCase {
private void assertSetReadOnly() throws SQLException {
try (Connection connection1 = getDataSource().getConnection()) {
- executeUpdateWithLog(connection1, "insert into account(id,
balance) values (1, 0), (2, 100);");
+ executeUpdateWithLog(connection1, "INSERT INTO account(id,
balance) VALUES (1, 0), (2, 100);");
}
try (Connection connection2 = getDataSource().getConnection()) {
connection2.setReadOnly(true);
assertQueryBalance(connection2);
- executeWithLog(connection2, "update account set balance = 100
where id = 2;");
+ executeWithLog(connection2, "UPDATE account SET balance = 100
WHERE id = 2;");
log.info("Using the driver of postgresql:42.4.3 expect to update
successfully.");
}
}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/readonly/SetReadOnlyTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/readonly/SetReadOnlyTestCase.java
index 573dd2f82cc..96b8a191be1 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/readonly/SetReadOnlyTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/readonly/SetReadOnlyTestCase.java
@@ -39,8 +39,8 @@ public abstract class SetReadOnlyTestCase extends
BaseTransactionTestCase {
void assertNotSetReadOnly() throws SQLException {
try (Connection connection = getDataSource().getConnection()) {
assertQueryBalance(connection);
- executeUpdateWithLog(connection, "update account set balance = 101
where id = 2;");
- ResultSet resultSet = executeQueryWithLog(connection, "select *
from account where id = 2");
+ executeUpdateWithLog(connection, "UPDATE account SET balance = 101
WHERE id = 2;");
+ ResultSet resultSet = executeQueryWithLog(connection, "SELECT *
FROM account WHERE id = 2");
assertTrue(resultSet.next());
int balanceResult = resultSet.getInt("balance");
assertThat(String.format("Balance is %s, should be 101.",
balanceResult), balanceResult, is(101));
@@ -48,7 +48,7 @@ public abstract class SetReadOnlyTestCase extends
BaseTransactionTestCase {
}
void assertQueryBalance(final Connection connection) throws SQLException {
- ResultSet resultSet = executeQueryWithLog(connection, "select * from
account;");
+ ResultSet resultSet = executeQueryWithLog(connection, "SELECT * FROM
account;");
while (resultSet.next()) {
int id = resultSet.getInt("id");
int balance = resultSet.getInt("balance");
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/savepoint/BaseSavePointTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/savepoint/BaseSavePointTestCase.java
index d34bc50c500..2067120c702 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/savepoint/BaseSavePointTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/savepoint/BaseSavePointTestCase.java
@@ -36,7 +36,7 @@ public abstract class BaseSavePointTestCase extends
BaseTransactionTestCase {
try (Connection connection = getDataSource().getConnection()) {
connection.setAutoCommit(false);
assertAccountRowCount(connection, 0);
- executeWithLog(connection, "insert into account(id, balance,
transaction_id) values(1, 1, 1);");
+ executeWithLog(connection, "INSERT INTO account(id, balance,
transaction_id) VALUES(1, 1, 1);");
Savepoint savepoint = connection.setSavepoint("point1");
executeSQLInSavepoint(connection);
connection.rollback(savepoint);
@@ -52,7 +52,7 @@ public abstract class BaseSavePointTestCase extends
BaseTransactionTestCase {
private void executeSQLInSavepoint(final Connection connection) throws
SQLException {
assertAccountRowCount(connection, 1);
- executeWithLog(connection, "insert into account(id, balance,
transaction_id) values(2, 2, 2);");
+ executeWithLog(connection, "INSERT INTO account(id, balance,
transaction_id) VALUES(2, 2, 2);");
assertAccountRowCount(connection, 2);
}
@@ -60,10 +60,10 @@ public abstract class BaseSavePointTestCase extends
BaseTransactionTestCase {
try (Connection connection = getDataSource().getConnection()) {
connection.setAutoCommit(false);
assertAccountRowCount(connection, 1);
- executeWithLog(connection, "insert into account(id, balance,
transaction_id) values(2, 2, 2);");
+ executeWithLog(connection, "INSERT INTO account(id, balance,
transaction_id) VALUES(2, 2, 2);");
final Savepoint savepoint = connection.setSavepoint("point2");
assertAccountRowCount(connection, 2);
- executeWithLog(connection, "insert into account(id, balance,
transaction_id) values(3, 3, 3);");
+ executeWithLog(connection, "INSERT INTO account(id, balance,
transaction_id) VALUES(3, 3, 3);");
assertAccountRowCount(connection, 3);
connection.releaseSavepoint(savepoint);
assertAccountRowCount(connection, 3);
@@ -73,10 +73,10 @@ public abstract class BaseSavePointTestCase extends
BaseTransactionTestCase {
try (Connection connection = getDataSource().getConnection()) {
connection.setAutoCommit(false);
assertAccountRowCount(connection, 3);
- executeWithLog(connection, "insert into account(id, balance,
transaction_id) values(4, 4, 4);");
+ executeWithLog(connection, "INSERT INTO account(id, balance,
transaction_id) VALUES(4, 4, 4);");
executeWithLog(connection, "SAVEPOINT point1");
assertAccountRowCount(connection, 4);
- executeWithLog(connection, "insert into account(id, balance,
transaction_id) values(5, 5, 5);");
+ executeWithLog(connection, "INSERT INTO account(id, balance,
transaction_id) VALUES(5, 5, 5);");
assertAccountRowCount(connection, 5);
executeWithLog(connection, "RELEASE SAVEPOINT point1");
assertAccountRowCount(connection, 5);
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/truncate/MySQLXATruncateTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/truncate/MySQLXATruncateTestCase.java
index 35c50eed8a6..0704c96a0f4 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/truncate/MySQLXATruncateTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/truncate/MySQLXATruncateTestCase.java
@@ -49,8 +49,8 @@ public final class MySQLXATruncateTestCase extends
BaseTransactionTestCase {
private void prepare() throws SQLException {
try (Connection connection = getDataSource().getConnection()) {
- executeWithLog(connection, "delete from account;");
- executeWithLog(connection, "insert into account(id, balance,
transaction_id) values(1, 1, 1),(2, 2, 2),(3, 3, 3),(4, 4, 4),(5, 5, 5),(6, 6,
6),(7, 7, 7),(8, 8, 8);");
+ executeWithLog(connection, "DELETE FROM account;");
+ executeWithLog(connection, "INSERT INTO account(id, balance,
transaction_id) VALUES(1, 1, 1),(2, 2, 2),(3, 3, 3),(4, 4, 4),(5, 5, 5),(6, 6,
6),(7, 7, 7),(8, 8, 8);");
}
}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/truncate/PostgreSQLAndOpenGaussTruncateTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/truncate/PostgreSQLAndOpenGaussTruncateTestCase.java
index fa06b71b4e2..3e459c86a3d 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/truncate/PostgreSQLAndOpenGaussTruncateTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/cases/truncate/PostgreSQLAndOpenGaussTruncateTestCase.java
@@ -46,7 +46,7 @@ public final class PostgreSQLAndOpenGaussTruncateTestCase
extends BaseTransactio
try (Connection connection = getDataSource().getConnection()) {
connection.setAutoCommit(false);
assertAccountRowCount(connection, 8);
- executeWithLog(connection, "truncate account;");
+ executeWithLog(connection, "TRUNCATE account;");
assertAccountRowCount(connection, 0);
connection.rollback();
// Expected truncate operation can be rolled back in PostgreSQL &
OpenGauss
@@ -59,7 +59,7 @@ public final class PostgreSQLAndOpenGaussTruncateTestCase
extends BaseTransactio
try (Connection connection = getDataSource().getConnection()) {
connection.setAutoCommit(false);
assertAccountRowCount(connection, 8);
- executeWithLog(connection, "truncate account;");
+ executeWithLog(connection, "TRUNCATE account;");
assertAccountRowCount(connection, 0);
connection.commit();
assertAccountRowCount(connection, 0);
@@ -69,8 +69,8 @@ public final class PostgreSQLAndOpenGaussTruncateTestCase
extends BaseTransactio
private void prepare() throws SQLException {
try (Connection connection = getDataSource().getConnection()) {
connection.setAutoCommit(false);
- executeWithLog(connection, "delete from account;");
- executeWithLog(connection, "insert into account(id, balance,
transaction_id) values(1, 1, 1),(2, 2, 2),(3, 3, 3),(4, 4, 4),(5, 5, 5),(6, 6,
6),(7, 7, 7),(8, 8, 8);");
+ executeWithLog(connection, "DELETE FROM account;");
+ executeWithLog(connection, "INSERT INTO account(id, balance,
transaction_id) VALUES(1, 1, 1),(2, 2, 2),(3, 3, 3),(4, 4, 4),(5, 5, 5),(6, 6,
6),(7, 7, 7),(8, 8, 8);");
connection.commit();
}
}
diff --git
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/commons/repository/AddressRepository.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/commons/repository/AddressRepository.java
index b0062f70a56..2717254b9bf 100644
---
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/commons/repository/AddressRepository.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/commons/repository/AddressRepository.java
@@ -88,7 +88,7 @@ public final class AddressRepository {
* @throws SQLException SQL exception
*/
public void createAcidTableInHiveServer2() throws SQLException {
- String sql = "create table IF NOT EXISTS t_address (address_id BIGINT
NOT NULL,address_name VARCHAR(100) NOT NULL,"
+ String sql = "CREATE TABLE IF NOT EXISTS t_address (address_id BIGINT
NOT NULL,address_name VARCHAR(100) NOT NULL,"
+ "PRIMARY KEY (address_id) disable novalidate) CLUSTERED BY
(address_id) INTO 2 BUCKETS STORED AS ORC TBLPROPERTIES ('transactional' =
'true')";
try (
Connection connection = dataSource.getConnection();
@@ -183,7 +183,7 @@ public final class AddressRepository {
* @throws SQLException SQL exception
*/
public void deleteInClickHouse(final Long id) throws SQLException {
- String sql = "alter table t_address delete where address_id=?";
+ String sql = "ALTER TABLE t_address delete WHERE address_id=?";
try (
Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement =
connection.prepareStatement(sql)) {
diff --git
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/modes/cluster/EtcdTest.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/modes/cluster/EtcdTest.java
index 44965cc4902..098fefc93b5 100644
---
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/modes/cluster/EtcdTest.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/modes/cluster/EtcdTest.java
@@ -96,9 +96,9 @@ class EtcdTest {
testShardingService.getAddressRepository().createTableIfNotExistsInMySQL();
Awaitility.await().atMost(Duration.ofMinutes(2L)).ignoreExceptions().until(()
-> {
try (Connection connection = logicDataSource.getConnection()) {
- connection.createStatement().execute("select * from t_order");
- connection.createStatement().execute("select * from
t_order_item");
- connection.createStatement().execute("select * from
t_address");
+ connection.createStatement().execute("SELECT * FROM t_order");
+ connection.createStatement().execute("SELECT * FROM
t_order_item");
+ connection.createStatement().execute("SELECT * FROM
t_address");
}
return true;
});
diff --git
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/modes/cluster/ZookeeperTest.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/modes/cluster/ZookeeperTest.java
index bfbb1c9e8ac..af29ba7f4a8 100644
---
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/modes/cluster/ZookeeperTest.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/modes/cluster/ZookeeperTest.java
@@ -88,9 +88,9 @@ class ZookeeperTest {
testShardingService.getAddressRepository().createTableIfNotExistsInMySQL();
Awaitility.await().atMost(Duration.ofMinutes(2L)).ignoreExceptions().until(()
-> {
try (Connection connection = logicDataSource.getConnection()) {
- connection.createStatement().execute("select * from t_order");
- connection.createStatement().execute("select * from
t_order_item");
- connection.createStatement().execute("select * from
t_address");
+ connection.createStatement().execute("SELECT * FROM t_order");
+ connection.createStatement().execute("SELECT * FROM
t_order_item");
+ connection.createStatement().execute("SELECT * FROM
t_address");
}
return true;
});
