You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2023/03/08 02:31:01 UTC
[shardingsphere] branch master updated: Rename Postgres to PostgreSQL (#24493)
This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 b2ad984d8ad Rename Postgres to PostgreSQL (#24493)
b2ad984d8ad is described below
commit b2ad984d8ad433f10332cb1dc92fe3b2fe7a5de5
Author: yx9o <ya...@163.com>
AuthorDate: Wed Mar 8 10:30:54 2023 +0800
Rename Postgres to PostgreSQL (#24493)
---
.../shardingsphere-proxy/optional-plugins/_index.cn.md | 8 ++++----
.../shardingsphere-proxy/optional-plugins/_index.en.md | 8 ++++----
.../shardingsphere/infra/metadata/ShardingSphereMetaDataTest.java | 2 +-
...tPostgresDDLAdapter.java => AbstractPostgreSQLDDLAdapter.java} | 6 +++---
...rtiesAppender.java => PostgreSQLColumnPropertiesAppender.java} | 8 ++++----
...Appender.java => PostgreSQLConstraintsPropertiesAppender.java} | 6 +++---
.../ddlgenerator/PostgreSQLCreateTableSQLGenerator.java | 8 ++++----
...resIndexSQLGenerator.java => PostgreSQLIndexSQLGenerator.java} | 6 +++---
...PropertiesLoader.java => PostgreSQLTablePropertiesLoader.java} | 6 +++---
.../prepare/datasource/PostgreSQLDataSourcePreparer.java | 2 +-
.../sql/dialect/handler/ddl/CreateIndexStatementHandlerTest.java | 2 +-
.../sql/dialect/handler/ddl/DropIndexStatementHandlerTest.java | 2 +-
.../sql/dialect/handler/ddl/DropTableStatementHandlerTest.java | 2 +-
.../pipeline/cases/createtable/CreateTableSQLGeneratorIT.java | 2 +-
.../test/e2e/data/pipeline/env/PipelineE2EEnvironment.java | 6 +++---
...LAutoCommitTestCase.java => PostgreSQLAutoCommitTestCase.java} | 6 +++---
...eTestCase.java => PostgreSQLAndOpenGaussTruncateTestCase.java} | 6 +++---
.../test/e2e/transaction/engine/base/BaseE2EIT.java | 2 +-
.../test/e2e/transaction/env/TransactionE2EEnvironment.java | 4 ++--
test/e2e/transaction/src/test/resources/env/it-env.properties | 2 +-
20 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.cn.md
index b0b324cfa79..7935bfebd95 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.cn.md
@@ -12,11 +12,11 @@ ShardingSphere 默认情况下仅包含核心 SPI 的实现，在 Git Source 存
- `org.apache.shardingsphere:shardingsphere-db-protocol-core`，数据库协议核心
- `org.apache.shardingsphere:shardingsphere-mysql-protocol`，数据库协议的 MySQL 实现
-- `org.apache.shardingsphere:shardingsphere-postgresql-protocol`，数据库协议的 PostgresSQL 实现
+- `org.apache.shardingsphere:shardingsphere-postgresql-protocol`，数据库协议的 PostgreSQL 实现
- `org.apache.shardingsphere:shardingsphere-opengauss-protocol`，数据库协议的 OpenGauss 实现
- `org.apache.shardingsphere:shardingsphere-proxy-frontend-core`，用于 ShardingSphere-Proxy 解析与适配访问数据库的协议
- `org.apache.shardingsphere:shardingsphere-proxy-frontend-mysql`，用于 ShardingSphere-Proxy 解析与适配访问数据库的协议的 MySQL 实现
-- `org.apache.shardingsphere:shardingsphere-proxy-frontend-postgresql`，用于 ShardingSphere-Proxy 解析与适配访问数据库的协议的 PostgresSQL 实现
+- `org.apache.shardingsphere:shardingsphere-proxy-frontend-postgresql`，用于 ShardingSphere-Proxy 解析与适配访问数据库的协议的 PostgreSQL 实现
- `org.apache.shardingsphere:shardingsphere-proxy-frontend-opengauss`，用于 ShardingSphere-Proxy 解析与适配访问数据库的协议的 openGauss 实现
- `org.apache.shardingsphere:shardingsphere-proxy-backend`，ShardingSphere Proxy 的后端
- `org.apache.shardingsphere:shardingsphere-cluster-mode-repository-zookeeper`，集群模式配置信息持久化定义的 zookeeper 实现
@@ -28,12 +28,12 @@ ShardingSphere 默认情况下仅包含核心 SPI 的实现，在 Git Source 存
- `org.apache.shardingsphere:shardingsphere-transaction-core`，XA 分布式事务管理器核心
- `org.apache.shardingsphere:shardingsphere-sql-parser-sql92`，SQL 解析的 SQL 92 方言实现
- `org.apache.shardingsphere:shardingsphere-sql-parser-mysql`，SQL 解析的 MySQL 方言实现
-- `org.apache.shardingsphere:shardingsphere-sql-parser-postgresql`，SQL 解析的 PostgresSQL 方言实现
+- `org.apache.shardingsphere:shardingsphere-sql-parser-postgresql`，SQL 解析的 PostgreSQL 方言实现
- `org.apache.shardingsphere:shardingsphere-sql-parser-oracle`，SQL 解析的 Oracle 方言解析实现
- `org.apache.shardingsphere:shardingsphere-sql-parser-sqlserver`，SQL 解析的 SQL Server 方言实现
- `org.apache.shardingsphere:shardingsphere-sql-parser-opengauss`，SQL 解析的 OpenGauss 方言实现
- `org.apache.shardingsphere:shardingsphere-mysql-dialect-exception`， 数据库网关的 MySQL 实现
-- `org.apache.shardingsphere:shardingsphere-postgresql-dialect-exception`，数据库网关的 PostgresSQL 实现
+- `org.apache.shardingsphere:shardingsphere-postgresql-dialect-exception`，数据库网关的 PostgreSQL 实现
- `org.apache.shardingsphere:shardingsphere-authority-core`，用户权限加载逻辑核心
- `org.apache.shardingsphere:shardingsphere-single-table-core`，单表（所有的分片数据源中仅唯一存在的表）核心
- `org.apache.shardingsphere:shardingsphere-traffic-core`，流量治理核心
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.en.md b/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.en.md
index d0d67905130..1a2d7bbdcad 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.en.md
@@ -14,11 +14,11 @@ All built-in plugins are listed below in the form of `groupId:artifactId`.
- `org.apache.shardingsphere:shardingsphere-db-protocol-core`, database protocol core
- `org.apache.shardingsphere:shardingsphere-mysql-protocol`, the MySQL implementation of the database protocol
-- `org.apache.shardingsphere:shardingsphere-postgresql-protocol`, the PostgresSQL implementation of the database protocol
+- `org.apache.shardingsphere:shardingsphere-postgresql-protocol`, the PostgreSQL implementation of the database protocol
- `org.apache.shardingsphere:shardingsphere-opengauss-protocol`, the OpenGauss implementation of the database protocol
- `org.apache.shardingsphere:shardingsphere-proxy-frontend-core`, used by ShardingSphere-Proxy to parse and adapt the protocol for accessing the database
- `org.apache.shardingsphere:shardingsphere-proxy-frontend-mysql`, a MySQL implementation for ShardingSphere-Proxy to parse and adapt the protocol for accessing the database
-- `org.apache.shardingsphere:shardingsphere-proxy-frontend-postgresql`, a PostgresSQL implementation for ShardingSphere-Proxy to parse and adapt the protocol for accessing the database
+- `org.apache.shardingsphere:shardingsphere-proxy-frontend-postgresql`, a PostgreSQL implementation for ShardingSphere-Proxy to parse and adapt the protocol for accessing the database
- `org.apache.shardingsphere:shardingsphere-proxy-frontend-opengauss`, an openGauss implementation for ShardingSphere-Proxy to parse and adapt the protocol for accessing the database
- `org.apache.shardingsphere:shardingsphere-proxy-backend`, the backend for ShardingSphere Proxy
- `org.apache.shardingsphere:shardingsphere-cluster-mode-repository-zookeeper`, the zookeeper implementation of the persistent definition of cluster mode configuration information
@@ -30,12 +30,12 @@ For the core `org.apache.shardingsphere:shardingsphere-jdbc-core`, the following
- `org.apache.shardingsphere:shardingsphere-transaction-core`, XA Distributed Transaction Manager Core
- `org.apache.shardingsphere:shardingsphere-sql-parser-sql92`, the SQL 92 dialect implementation of SQL parsing
- `org.apache.shardingsphere:shardingsphere-sql-parser-mysql`, MySQL dialect implementation of SQL parsing
-- `org.apache.shardingsphere:shardingsphere-sql-parser-postgresql`, PostgresSQL dialect implementation of SQL parsing
+- `org.apache.shardingsphere:shardingsphere-sql-parser-postgresql`, PostgreSQL dialect implementation of SQL parsing
- `org.apache.shardingsphere:shardingsphere-sql-parser-oracle`, Oracle dialect parsing implementation for SQL parsing
- `org.apache.shardingsphere:shardingsphere-sql-parser-sqlserver`, the SQL Server dialect implementation of SQL parsing
- `org.apache.shardingsphere:shardingsphere-sql-parser-opengauss`, the OpenGauss dialect implementation of SQL parsing
- `org.apache.shardingsphere:shardingsphere-mysql-dialect-exception`, MySQL implementation of database gateway
-- `org.apache.shardingsphere:shardingsphere-postgresql-dialect-exception`, PostgresSQL implementation of database
+- `org.apache.shardingsphere:shardingsphere-postgresql-dialect-exception`, PostgreSQL implementation of database
gateway
- `org.apache.shardingsphere:shardingsphere-authority-core`, the user authority to load the logical core
- `org.apache.shardingsphere:shardingsphere-single-table-core`, single-table (only the only table that exists in all
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/ShardingSphereMetaDataTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/ShardingSphereMetaDataTest.java
index fbbe343ea46..4bd8790d2e4 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/ShardingSphereMetaDataTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/ShardingSphereMetaDataTest.java
@@ -96,7 +96,7 @@ public final class ShardingSphereMetaDataTest {
}
@Test
- public void assertGetPostgresDefaultSchema() throws SQLException {
+ public void assertGetPostgreSQLDefaultSchema() throws SQLException {
PostgreSQLDatabaseType databaseType = new PostgreSQLDatabaseType();
ShardingSphereDatabase actual = ShardingSphereDatabase.create("foo_db", databaseType, Collections.singletonMap("", databaseType),
mock(DataSourceProvidedDatabaseConfiguration.class), new ConfigurationProperties(new Properties()), mock(InstanceContext.class));
diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/AbstractPostgresDDLAdapter.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/AbstractPostgreSQLDDLAdapter.java
similarity index 94%
rename from kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/AbstractPostgresDDLAdapter.java
rename to kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/AbstractPostgreSQLDDLAdapter.java
index 0c1b6cfb85b..373d25a1470 100644
--- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/AbstractPostgresDDLAdapter.java
+++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/AbstractPostgreSQLDDLAdapter.java
@@ -35,10 +35,10 @@ import java.util.Map;
import java.util.stream.Collectors;
/**
- * Abstract postgres ddl adapter.
+ * Abstract ddl adapter for PostgreSQL.
*/
@Getter
-public abstract class AbstractPostgresDDLAdapter {
+public abstract class AbstractPostgreSQLDDLAdapter {
private static final String SECURITY_LABEL_SPLIT = "=";
@@ -48,7 +48,7 @@ public abstract class AbstractPostgresDDLAdapter {
private final int minorVersion;
- protected AbstractPostgresDDLAdapter(final Connection connection, final int majorVersion, final int minorVersion) {
+ protected AbstractPostgreSQLDDLAdapter(final Connection connection, final int majorVersion, final int minorVersion) {
this.connection = connection;
this.majorVersion = majorVersion;
this.minorVersion = minorVersion;
diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresColumnPropertiesAppender.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLColumnPropertiesAppender.java
similarity index 98%
rename from kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresColumnPropertiesAppender.java
rename to kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLColumnPropertiesAppender.java
index d0642332793..125f92bff83 100644
--- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresColumnPropertiesAppender.java
+++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLColumnPropertiesAppender.java
@@ -33,9 +33,9 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors;
/**
- * Postgres column properties appender.
+ * Column properties appender for PostgreSQL.
*/
-public final class PostgresColumnPropertiesAppender extends AbstractPostgresDDLAdapter {
+public final class PostgreSQLColumnPropertiesAppender extends AbstractPostgreSQLDDLAdapter {
private static final Pattern LENGTH_PRECISION_PATTERN = Pattern.compile("(\\d+),(\\d+)");
@@ -45,13 +45,13 @@ public final class PostgresColumnPropertiesAppender extends AbstractPostgresDDLA
private static final String ATT_OPTION_SPLIT = "=";
- public PostgresColumnPropertiesAppender(final Connection connection, final int majorVersion, final int minorVersion) {
+ public PostgreSQLColumnPropertiesAppender(final Connection connection, final int majorVersion, final int minorVersion) {
super(connection, majorVersion, minorVersion);
}
/**
* Append column properties.
- *
+ *
* @param context create table sql context
*/
@SneakyThrows(SQLException.class)
diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresConstraintsPropertiesAppender.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLConstraintsPropertiesAppender.java
similarity index 97%
rename from kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresConstraintsPropertiesAppender.java
rename to kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLConstraintsPropertiesAppender.java
index f5014d5a2c4..de3f8a23871 100644
--- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresConstraintsPropertiesAppender.java
+++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLConstraintsPropertiesAppender.java
@@ -29,13 +29,13 @@ import java.util.Set;
import java.util.stream.Collectors;
/**
- * Postgres constraints properties appender.
+ * Constraints properties appender for PostgreSQL.
*/
-public final class PostgresConstraintsPropertiesAppender extends AbstractPostgresDDLAdapter {
+public final class PostgreSQLConstraintsPropertiesAppender extends AbstractPostgreSQLDDLAdapter {
private static final Integer PG_CONSTRAINTS_INCLUDE_VERSION = 11;
- public PostgresConstraintsPropertiesAppender(final Connection connection, final int majorVersion, final int minorVersion) {
+ public PostgreSQLConstraintsPropertiesAppender(final Connection connection, final int majorVersion, final int minorVersion) {
super(connection, majorVersion, minorVersion);
}
diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLCreateTableSQLGenerator.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLCreateTableSQLGenerator.java
index 141b1577813..8de9ef2a364 100644
--- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLCreateTableSQLGenerator.java
+++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLCreateTableSQLGenerator.java
@@ -49,9 +49,9 @@ public final class PostgreSQLCreateTableSQLGenerator implements CreateTableSQLGe
}
private Map<String, Object> loadMaterials(final String tableName, final String schemaName, final Connection connection, final int majorVersion, final int minorVersion) throws SQLException {
- Map<String, Object> result = new PostgresTablePropertiesLoader(connection, tableName, schemaName, majorVersion, minorVersion).load();
- new PostgresColumnPropertiesAppender(connection, majorVersion, minorVersion).append(result);
- new PostgresConstraintsPropertiesAppender(connection, majorVersion, minorVersion).append(result);
+ Map<String, Object> result = new PostgreSQLTablePropertiesLoader(connection, tableName, schemaName, majorVersion, minorVersion).load();
+ new PostgreSQLColumnPropertiesAppender(connection, majorVersion, minorVersion).append(result);
+ new PostgreSQLConstraintsPropertiesAppender(connection, majorVersion, minorVersion).append(result);
formatColumns(result);
return result;
}
@@ -61,7 +61,7 @@ public final class PostgreSQLCreateTableSQLGenerator implements CreateTableSQLGe
}
private String generateCreateIndexSQL(final Connection connection, final int majorVersion, final int minorVersion, final Map<String, Object> materials) throws SQLException {
- return new PostgresIndexSQLGenerator(connection, majorVersion, minorVersion).generate(materials);
+ return new PostgreSQLIndexSQLGenerator(connection, majorVersion, minorVersion).generate(materials);
}
@SuppressWarnings("unchecked")
diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresIndexSQLGenerator.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLIndexSQLGenerator.java
similarity index 96%
rename from kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresIndexSQLGenerator.java
rename to kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLIndexSQLGenerator.java
index 2399b2852e6..f9f1a44d19c 100644
--- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresIndexSQLGenerator.java
+++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLIndexSQLGenerator.java
@@ -28,13 +28,13 @@ import java.util.LinkedList;
import java.util.Map;
/**
- * Postgres index SQL generator.
+ * Index SQL generator for PostgreSQL.
*/
-public final class PostgresIndexSQLGenerator extends AbstractPostgresDDLAdapter {
+public final class PostgreSQLIndexSQLGenerator extends AbstractPostgreSQLDDLAdapter {
private static final Integer PG_INDEX_INCLUDE_VERSION = 11;
- public PostgresIndexSQLGenerator(final Connection connection, final int majorVersion, final int minorVersion) {
+ public PostgreSQLIndexSQLGenerator(final Connection connection, final int majorVersion, final int minorVersion) {
super(connection, majorVersion, minorVersion);
}
diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresTablePropertiesLoader.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLTablePropertiesLoader.java
similarity index 95%
rename from kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresTablePropertiesLoader.java
rename to kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLTablePropertiesLoader.java
index c97a0200f11..3f5f3ef1583 100644
--- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresTablePropertiesLoader.java
+++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLTablePropertiesLoader.java
@@ -25,15 +25,15 @@ import java.util.LinkedHashMap;
import java.util.Map;
/**
- * Postgres table properties loader.
+ * Table properties loader for PostgreSQL.
*/
-public final class PostgresTablePropertiesLoader extends AbstractPostgresDDLAdapter {
+public final class PostgreSQLTablePropertiesLoader extends AbstractPostgreSQLDDLAdapter {
private final String tableName;
private final String schemaName;
- public PostgresTablePropertiesLoader(final Connection connection, final String tableName, final String schemaName, final int majorVersion, final int minorVersion) {
+ public PostgreSQLTablePropertiesLoader(final Connection connection, final String tableName, final String schemaName, final int majorVersion, final int minorVersion) {
super(connection, majorVersion, minorVersion);
this.tableName = tableName;
this.schemaName = schemaName;
diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/prepare/datasource/PostgreSQLDataSourcePreparer.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/prepare/datasource/PostgreSQLDataSourcePreparer.java
index 9784a91d457..124305f39be 100644
--- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/prepare/datasource/PostgreSQLDataSourcePreparer.java
+++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/prepare/datasource/PostgreSQLDataSourcePreparer.java
@@ -29,7 +29,7 @@ import java.sql.SQLException;
import java.util.stream.Collectors;
/**
- * Data source preparer for PostgresSQL.
+ * Data source preparer for PostgreSQL.
*/
public final class PostgreSQLDataSourcePreparer extends AbstractDataSourcePreparer {
diff --git a/sql-parser/statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/CreateIndexStatementHandlerTest.java b/sql-parser/statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/CreateIndexStatementHandlerTest.java
index bd17c55b3db..b24d892122e 100644
--- a/sql-parser/statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/CreateIndexStatementHandlerTest.java
+++ b/sql-parser/statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/CreateIndexStatementHandlerTest.java
@@ -42,7 +42,7 @@ public final class CreateIndexStatementHandlerTest {
}
@Test
- public void assertGeneratedIndexStartIndexForPostgres() {
+ public void assertGeneratedIndexStartIndexForPostgreSQL() {
PostgreSQLCreateIndexStatement postgreSQLCreateIndexStatement = new PostgreSQLCreateIndexStatement(true);
postgreSQLCreateIndexStatement.setGeneratedIndexStartIndex(2);
Optional<Integer> actual = CreateIndexStatementHandler.getGeneratedIndexStartIndex(postgreSQLCreateIndexStatement);
diff --git a/sql-parser/statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropIndexStatementHandlerTest.java b/sql-parser/statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropIndexStatementHandlerTest.java
index 9469be58c7e..01f3ee3b3ce 100644
--- a/sql-parser/statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropIndexStatementHandlerTest.java
+++ b/sql-parser/statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropIndexStatementHandlerTest.java
@@ -72,7 +72,7 @@ public final class DropIndexStatementHandlerTest {
}
@Test
- public void assertIfExistsForPostgres() {
+ public void assertIfExistsForPostgreSQL() {
assertFalse(DropIndexStatementHandler.ifExists(new PostgreSQLDropIndexStatement(false)));
assertTrue(DropIndexStatementHandler.ifExists(new PostgreSQLDropIndexStatement(true)));
}
diff --git a/sql-parser/statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropTableStatementHandlerTest.java b/sql-parser/statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropTableStatementHandlerTest.java
index 845d32d6352..e7e75540504 100644
--- a/sql-parser/statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropTableStatementHandlerTest.java
+++ b/sql-parser/statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropTableStatementHandlerTest.java
@@ -61,7 +61,7 @@ public final class DropTableStatementHandlerTest {
}
@Test
- public void assertContainsCascadeForPostgres() {
+ public void assertContainsCascadeForPostgreSQL() {
assertFalse(DropTableStatementHandler.containsCascade(new PostgreSQLDropTableStatement(false, false)));
assertTrue(DropTableStatementHandler.containsCascade(new PostgreSQLDropTableStatement(true, true)));
}
diff --git a/test/e2e/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java b/test/e2e/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
index ff0b178e402..722dae50189 100644
--- a/test/e2e/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
+++ b/test/e2e/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
@@ -110,7 +110,7 @@ public final class CreateTableSQLGeneratorIT {
if (ENV.getItEnvType() == PipelineEnvTypeEnum.NONE) {
return result;
}
- for (String each : ENV.getPostgresVersions()) {
+ for (String each : ENV.getPostgresqlVersions()) {
result.add(new PipelineTestParameter(new PostgreSQLDatabaseType(), each, String.join("/", PARENT_PATH, POSTGRES_CASE_FILE_PATH)));
}
for (String each : ENV.getMysqlVersions()) {
diff --git a/test/e2e/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/env/PipelineE2EEnvironment.java b/test/e2e/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/env/PipelineE2EEnvironment.java
index d2d08a18596..cafd64d837f 100644
--- a/test/e2e/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/env/PipelineE2EEnvironment.java
+++ b/test/e2e/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/env/PipelineE2EEnvironment.java
@@ -45,7 +45,7 @@ public final class PipelineE2EEnvironment {
private final List<String> mysqlVersions;
- private final List<String> postgresVersions;
+ private final List<String> postgresqlVersions;
private final List<String> openGaussVersions;
@@ -53,7 +53,7 @@ public final class PipelineE2EEnvironment {
props = loadProperties();
itEnvType = PipelineEnvTypeEnum.valueOf(props.getProperty("pipeline.it.env.type", PipelineEnvTypeEnum.NONE.name()).toUpperCase());
mysqlVersions = Arrays.stream(props.getOrDefault("pipeline.it.docker.mysql.version", "").toString().split(",")).filter(each -> !Strings.isNullOrEmpty(each)).collect(Collectors.toList());
- postgresVersions = Arrays.stream(props.getOrDefault("pipeline.it.docker.postgresql.version", "").toString().split(",")).filter(cs -> !Strings.isNullOrEmpty(cs)).collect(Collectors.toList());
+ postgresqlVersions = Arrays.stream(props.getOrDefault("pipeline.it.docker.postgresql.version", "").toString().split(",")).filter(cs -> !Strings.isNullOrEmpty(cs)).collect(Collectors.toList());
openGaussVersions = Arrays.stream(props.getOrDefault("pipeline.it.docker.opengauss.version", "").toString().split(",")).filter(cs -> !Strings.isNullOrEmpty(cs)).collect(Collectors.toList());
}
@@ -160,7 +160,7 @@ public final class PipelineE2EEnvironment {
case "MySQL":
return mysqlVersions;
case "PostgreSQL":
- return postgresVersions;
+ return postgresqlVersions;
case "openGauss":
return openGaussVersions;
default:
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/autocommit/PostgresSQLAutoCommitTestCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/autocommit/PostgreSQLAutoCommitTestCase.java
similarity index 91%
rename from test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/autocommit/PostgresSQLAutoCommitTestCase.java
rename to test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/autocommit/PostgreSQLAutoCommitTestCase.java
index 31012aeaf9d..1f688ca8d0c 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/autocommit/PostgresSQLAutoCommitTestCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/autocommit/PostgreSQLAutoCommitTestCase.java
@@ -33,12 +33,12 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
- * PostgresSQL auto commit transaction integration test.
+ * PostgreSQL auto commit transaction integration test.
*/
@TransactionTestCase(dbTypes = {TransactionTestConstants.POSTGRESQL}, transactionTypes = TransactionType.LOCAL)
-public final class PostgresSQLAutoCommitTestCase extends BaseTransactionTestCase {
+public final class PostgreSQLAutoCommitTestCase extends BaseTransactionTestCase {
- public PostgresSQLAutoCommitTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
+ public PostgreSQLAutoCommitTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
super(baseTransactionITCase, dataSource);
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/PostgresSQLAndOpenGaussTruncateTestCase.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/PostgreSQLAndOpenGaussTruncateTestCase.java
similarity index 91%
rename from test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/PostgresSQLAndOpenGaussTruncateTestCase.java
rename to test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/PostgreSQLAndOpenGaussTruncateTestCase.java
index 82142b805e4..995ff3b1c9e 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/PostgresSQLAndOpenGaussTruncateTestCase.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/PostgreSQLAndOpenGaussTruncateTestCase.java
@@ -27,12 +27,12 @@ import java.sql.Connection;
import java.sql.SQLException;
/**
- * PostgresSQL and OpenGauss truncate transaction integration test.
+ * PostgreSQL and OpenGauss truncate transaction integration test.
*/
@TransactionTestCase(dbTypes = {TransactionTestConstants.POSTGRESQL, TransactionTestConstants.OPENGAUSS})
-public final class PostgresSQLAndOpenGaussTruncateTestCase extends BaseTransactionTestCase {
+public final class PostgreSQLAndOpenGaussTruncateTestCase extends BaseTransactionTestCase {
- public PostgresSQLAndOpenGaussTruncateTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
+ public PostgreSQLAndOpenGaussTruncateTestCase(final TransactionBaseE2EIT baseTransactionITCase, final DataSource dataSource) {
super(baseTransactionITCase, dataSource);
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/BaseE2EIT.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/BaseE2EIT.java
index 0af840c8752..56d52e5ee0c 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/BaseE2EIT.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/BaseE2EIT.java
@@ -162,7 +162,7 @@ public abstract class BaseE2EIT {
if (TransactionTestConstants.MYSQL.equalsIgnoreCase(currentTestCaseInfo.getDbType())) {
addParametersByVersions(ENV.getMysqlVersions(), testParams, currentTestCaseInfo);
} else if (TransactionTestConstants.POSTGRESQL.equalsIgnoreCase(currentTestCaseInfo.getDbType())) {
- addParametersByVersions(ENV.getPostgresVersions(), testParams, currentTestCaseInfo);
+ addParametersByVersions(ENV.getPostgresqlVersions(), testParams, currentTestCaseInfo);
} else if (TransactionTestConstants.OPENGAUSS.equalsIgnoreCase(currentTestCaseInfo.getDbType())) {
addParametersByVersions(ENV.getOpenGaussVersions(), testParams, currentTestCaseInfo);
}
diff --git a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/TransactionE2EEnvironment.java b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/TransactionE2EEnvironment.java
index 22a47628980..8ee5df26eaf 100644
--- a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/TransactionE2EEnvironment.java
+++ b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/TransactionE2EEnvironment.java
@@ -50,7 +50,7 @@ public final class TransactionE2EEnvironment {
private final List<String> mysqlVersions;
- private final List<String> postgresVersions;
+ private final List<String> postgresqlVersions;
private final List<String> openGaussVersions;
@@ -66,7 +66,7 @@ public final class TransactionE2EEnvironment {
props = loadProperties();
itEnvType = TransactionE2EEnvTypeEnum.valueOf(props.getProperty("transaction.it.env.type", TransactionE2EEnvTypeEnum.NONE.name()).toUpperCase());
mysqlVersions = splitProperty("transaction.it.docker.mysql.version");
- postgresVersions = splitProperty("transaction.it.docker.postgresql.version");
+ postgresqlVersions = splitProperty("transaction.it.docker.postgresql.version");
openGaussVersions = splitProperty("transaction.it.docker.opengauss.version");
needToRunTestCases = splitProperty("transaction.it.env.cases");
allowTransactionTypes = splitProperty("transaction.it.env.transtypes");
diff --git a/test/e2e/transaction/src/test/resources/env/it-env.properties b/test/e2e/transaction/src/test/resources/env/it-env.properties
index b6e2e7ff801..4dd4e96719c 100644
--- a/test/e2e/transaction/src/test/resources/env/it-env.properties
+++ b/test/e2e/transaction/src/test/resources/env/it-env.properties
@@ -17,7 +17,7 @@
# transaction.it.type=NONE,DOCKER,NATIVE
transaction.it.env.type=NONE
# transaction.it.env.cases=ClassicTransferTestCase, PostgreSQLSavePointTestCase, TransactionTypeHolderTestCase
-transaction.it.env.cases=MultiJDBCConnectionsTestCase, MultiTransactionInConnectionTestCase, MultiOperationsCommitAndRollbackTestCase, MySQLAutoCommitTestCase, PostgresSQLAutoCommitTestCase, BroadcastTableTransactionTestCase, ExceptionInTransactionTestCase, MultiTableCommitAndRollbackTestCase, SingleTableCommitAndRollbackTestCase, MySQLSetReadOnlyTestCase, MySQLSavePointTestCase, MySQLLocalTruncateTestCase, MySQLXATruncateTestCase, OpenGaussCursorTestCase, NestedTransactionTestCase, SetT [...]
+transaction.it.env.cases=MultiJDBCConnectionsTestCase, MultiTransactionInConnectionTestCase, MultiOperationsCommitAndRollbackTestCase, MySQLAutoCommitTestCase, PostgreSQLAutoCommitTestCase, BroadcastTableTransactionTestCase, ExceptionInTransactionTestCase, MultiTableCommitAndRollbackTestCase, SingleTableCommitAndRollbackTestCase, MySQLSetReadOnlyTestCase, MySQLSavePointTestCase, MySQLLocalTruncateTestCase, MySQLXATruncateTestCase, OpenGaussCursorTestCase, NestedTransactionTestCase, SetTr [...]
# transaction.it.env.transtypes=LOCAL, XA, BASE
transaction.it.env.transtypes=LOCAL, XA
# transaction.it.env.xa.providers=Atomikos, Bitronix, Narayana