Skip to content

support PostgreSQL/openGauss default schema in ds config #35022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

support PostgreSQL/openGauss default schema in ds config #35022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3474a86
support PostgreSQL/openGauss default schema in ds config
wy1433 Mar 18, 2025
ac61771
fix checkStyle issue
wy1433 Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ...shardingsphere/infra/database/opengauss/metadata/data/loader/OpenGaussMetaDataLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@
import org.apache.shardingsphere.infra.database.core.metadata.data.model.IndexMetaData;
import org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
import org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import org.apache.shardingsphere.infra.database.core.metadata.database.DialectDatabaseMetaData;
import org.apache.shardingsphere.infra.database.core.metadata.database.datatype.DataTypeRegistry;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;

import java.sql.Connection;
Expand Down Expand Up @@ -70,7 +72,10 @@ public final class OpenGaussMetaDataLoader implements DialectMetaDataLoader {
@Override
public Collection<SchemaMetaData> load(final MetaDataLoaderMaterial material) throws SQLException {
try (Connection connection = material.getDataSource().getConnection()) {
Collection<String> schemaNames = SchemaMetaDataLoader.loadSchemaNames(connection, TypedSPILoader.getService(DatabaseType.class, "openGauss"));
DatabaseType databaseType = TypedSPILoader.getService(DatabaseType.class, "openGauss");
DialectDatabaseMetaData dialectDatabaseMetaData = new DatabaseTypeRegistry(databaseType).getDialectDatabaseMetaData();
dialectDatabaseMetaData.getSchema(connection);
Collection<String> schemaNames = SchemaMetaDataLoader.loadSchemaNames(connection, databaseType);
Map<String, Multimap<String, IndexMetaData>> schemaIndexMetaDataMap = loadIndexMetaDataMap(connection, schemaNames);
Map<String, Multimap<String, ColumnMetaData>> schemaColumnMetaDataMap = loadColumnMetaDataMap(connection, material.getActualTableNames(), schemaNames);
Collection<SchemaMetaData> result = new LinkedList<>();
Expand Down
11 changes: 10 additions & 1 deletion .../shardingsphere/infra/database/opengauss/metadata/database/OpenGaussDatabaseMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.apache.shardingsphere.infra.database.core.metadata.database.enums.NullsOrderType;
import org.apache.shardingsphere.infra.database.core.metadata.database.enums.QuoteCharacter;

import java.sql.Connection;
import java.sql.Types;
import java.util.Arrays;
import java.util.HashSet;
Expand All @@ -48,6 +49,8 @@ public final class OpenGaussDatabaseMetaData implements DialectDatabaseMetaData
"UNIQUE", "USER", "USING", "VALUES", "VARCHAR", "VARCHAR2", "VARIADIC", "VERBOSE", "VERIFY", "WHEN", "WHERE", "WINDOW", "WITH", "XMLATTRIBUTES", "XMLCONCAT", "XMLELEMENT", "XMLEXISTS",
"XMLFOREST", "XMLPARSE", "XMLPI", "XMLROOT", "XMLSERIALIZE"));

private String defaultSchema;

@Override
public QuoteCharacter getQuoteCharacter() {
return QuoteCharacter.QUOTE;
Expand Down Expand Up @@ -85,7 +88,13 @@ public boolean isSchemaAvailable() {

@Override
public Optional<String> getDefaultSchema() {
return Optional.of("public");
return this.defaultSchema != null ? Optional.of(this.defaultSchema) : Optional.of("public");
}

@Override
public String getSchema(final Connection connection) {
this.defaultSchema = DialectDatabaseMetaData.super.getSchema(connection);
return this.defaultSchema;
}

@Override
Expand Down
7 changes: 6 additions & 1 deletion ...ardingsphere/infra/database/postgresql/metadata/data/loader/PostgreSQLMetaDataLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@
import org.apache.shardingsphere.infra.database.core.metadata.data.model.IndexMetaData;
import org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
import org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import org.apache.shardingsphere.infra.database.core.metadata.database.DialectDatabaseMetaData;
import org.apache.shardingsphere.infra.database.core.metadata.database.datatype.DataTypeRegistry;
import org.apache.shardingsphere.infra.database.core.metadata.database.enums.TableType;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;

import java.sql.Connection;
Expand Down Expand Up @@ -84,7 +86,10 @@ public final class PostgreSQLMetaDataLoader implements DialectMetaDataLoader {
@Override
public Collection<SchemaMetaData> load(final MetaDataLoaderMaterial material) throws SQLException {
try (Connection connection = material.getDataSource().getConnection()) {
Collection<String> schemaNames = SchemaMetaDataLoader.loadSchemaNames(connection, TypedSPILoader.getService(DatabaseType.class, "PostgreSQL"));
DatabaseType databaseType = TypedSPILoader.getService(DatabaseType.class, "PostgreSQL");
DialectDatabaseMetaData dialectDatabaseMetaData = new DatabaseTypeRegistry(databaseType).getDialectDatabaseMetaData();
dialectDatabaseMetaData.getSchema(connection);
Collection<String> schemaNames = SchemaMetaDataLoader.loadSchemaNames(connection, databaseType);
Map<String, Multimap<String, IndexMetaData>> schemaIndexMetaDataMap = loadIndexMetaDataMap(connection, schemaNames);
Map<String, Multimap<String, ColumnMetaData>> schemaColumnMetaDataMap = loadColumnMetaDataMap(connection, material.getActualTableNames(), schemaNames);
Map<String, Multimap<String, ConstraintMetaData>> schemaConstraintMetaDataMap = loadConstraintMetaDataMap(connection, schemaNames);
Expand Down
11 changes: 10 additions & 1 deletion ...hardingsphere/infra/database/postgresql/metadata/database/PostgreSQLDatabaseMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.apache.shardingsphere.infra.database.core.metadata.database.enums.NullsOrderType;
import org.apache.shardingsphere.infra.database.core.metadata.database.enums.QuoteCharacter;

import java.sql.Connection;
import java.sql.Types;
import java.util.Arrays;
import java.util.HashSet;
Expand All @@ -45,6 +46,8 @@ public final class PostgreSQLDatabaseMetaData implements DialectDatabaseMetaData
"TABLESAMPLE", "THEN", "TIME", "TIMESTAMP", "TO", "TRAILING", "TREAT", "TRIM", "TRUE", "UNION", "UNIQUE", "USER", "USING", "VALUES", "VARCHAR", "VARIADIC", "VERBOSE", "WHEN", "WHERE",
"WINDOW", "WITH", "XMLATTRIBUTES", "XMLCONCAT", "XMLELEMENT", "XMLEXISTS", "XMLFOREST", "XMLNAMESPACES", "XMLPARSE", "XMLPI", "XMLROOT", "XMLSERIALIZE", "XMLTABLE"));

private String defaultSchema;

@Override
public QuoteCharacter getQuoteCharacter() {
return QuoteCharacter.QUOTE;
Expand Down Expand Up @@ -82,7 +85,13 @@ public boolean isSchemaAvailable() {

@Override
public Optional<String> getDefaultSchema() {
return Optional.of("public");
return this.defaultSchema != null ? Optional.of(this.defaultSchema) : Optional.of("public");
}

@Override
public String getSchema(final Connection connection) {
this.defaultSchema = DialectDatabaseMetaData.super.getSchema(connection);
return this.defaultSchema;
}

@Override
Expand Down
Loading