From 541f49d8b7f098d087a69ad7422a02d4dcfc66d3 Mon Sep 17 00:00:00 2001 From: Martin Vahlensieck Date: Tue, 19 Mar 2024 13:21:26 +0100 Subject: [PATCH] Adapt to recent Protobuf message changes --- .../polypheny/jdbc/meta/MetaResultSetBuilder.java | 7 ------- .../jdbc/meta/MetaResultSetComparators.java | 10 +++------- .../jdbc/meta/MetaResultSetSignatures.java | 14 +++++++------- .../jdbc/meta/PolyphenyDatabaseMetadata.java | 3 --- 4 files changed, 10 insertions(+), 24 deletions(-) diff --git a/src/main/java/org/polypheny/jdbc/meta/MetaResultSetBuilder.java b/src/main/java/org/polypheny/jdbc/meta/MetaResultSetBuilder.java index 3d6f0910..0af15dcd 100644 --- a/src/main/java/org/polypheny/jdbc/meta/MetaResultSetBuilder.java +++ b/src/main/java/org/polypheny/jdbc/meta/MetaResultSetBuilder.java @@ -129,7 +129,6 @@ public static ResultSet buildFromPrimaryKeys( List primaryKeys ) thr private static List expandPrimaryKey( PrimaryKey primaryKey ) { AtomicInteger sequenceIndex = new AtomicInteger(); return primaryKey.getColumnsList().stream().map( c -> new GenericMetaContainer( - c.getDatabaseName(), c.getNamespaceName(), c.getTableName(), c.getColumnName(), @@ -187,11 +186,8 @@ private static List expandForeignKey( ForeignKey foreignKe AtomicInteger sequenceIndex = new AtomicInteger(); List referencedKeyColumns = foreignKey.getReferencedColumnsList(); return foreignKey.getForeignColumnsList().stream().map( c -> new GenericMetaContainer( - foreignKey.getReferencedDatabaseName(), foreignKey.getReferencedNamespaceName(), foreignKey.getReferencedTableName(), - referencedKeyColumns.get( sequenceIndex.get() ).getDatabaseName(), - c.getDatabaseName(), c.getNamespaceName(), c.getTableName(), c.getColumnName(), @@ -232,7 +228,6 @@ public static ResultSet buildFromIndexes( List indexes ) throws SQLExcept private static List expandIndex( Index index ) { AtomicInteger ordinalPosition = new AtomicInteger( 1 ); return index.getColumnsList().stream().map( c -> new GenericMetaContainer( - index.getDatabaseName(), index.getNamespaceName(), index.getTableName(), !index.getUnique(), // jdbc lists non uniqueness @@ -281,7 +276,6 @@ private static List createDummyColumnPrivileges( Column co // This method is used to create a dummy full rights result set for a column because the requested information does not exist on the server side. List accessRights = Arrays.asList( "INSERT", "REFERENCE", "SELECT", "UPDATE" ); return accessRights.stream().map( a -> new GenericMetaContainer( - colum.getDatabaseName(), colum.getNamespaceName(), colum.getTableName(), colum.getColumnName(), @@ -312,7 +306,6 @@ private static List createDummyTablePrivileges( Table tabl // This method is used to create a dummy full rights result set for a table because the requested information does not exist on the server side. List accessRights = Arrays.asList( "SELECT", "INSERT", "UPDATE", "DELETE", "REFERENCE" ); return accessRights.stream().map( a -> new GenericMetaContainer( - table.getSourceDatabaseName(), table.getNamespaceName(), table.getTableName(), null, diff --git a/src/main/java/org/polypheny/jdbc/meta/MetaResultSetComparators.java b/src/main/java/org/polypheny/jdbc/meta/MetaResultSetComparators.java index f3a380e9..fe5a0574 100644 --- a/src/main/java/org/polypheny/jdbc/meta/MetaResultSetComparators.java +++ b/src/main/java/org/polypheny/jdbc/meta/MetaResultSetComparators.java @@ -10,8 +10,7 @@ public class MetaResultSetComparators { public static final Comparator TYPE_INFO_COMPARATOR = Comparator .comparing( t -> TypedValueUtils.getJdbcTypeFromPolyTypeName( t.getTypeName() ) ); public static final Comparator NAMESPACE_COMPARATOR = Comparator - .comparing( Namespace::getDatabaseName ) - .thenComparing( Namespace::getNamespaceName ); + .comparing( Namespace::getNamespaceName ); public static final Comparator PRIMARY_KEY_COMPARATOR = Comparator .comparing( g -> (String) (g.getValue( 3 )) ); public static final Comparator INDEX_COMPARATOR = Comparator @@ -33,18 +32,15 @@ public class MetaResultSetComparators { public static final Comparator FUNCTION_COMPARATOR = Comparator .comparing( Function::getName ); public static final Comparator COLUMN_COMPARATOR = Comparator - .comparing( Column::getDatabaseName ) - .thenComparing( Column::getNamespaceName ) + .comparing( Column::getNamespaceName ) .thenComparing( Column::getTableName ) .thenComparing( Column::getColumnIndex ); public static final Comparator TABLE_COMPARATOR = Comparator .comparing( Table::getTableType ) - .thenComparing( Table::getSourceDatabaseName ) .thenComparing( Table::getNamespaceName ) .thenComparing( Table::getTableName ); public static final Comparator PSEUDO_COLUMN_COMPARATOR = Comparator - .comparing( Column::getDatabaseName ) - .thenComparing( Column::getNamespaceName ) + .comparing( Column::getNamespaceName ) .thenComparing( Column::getTableName ) .thenComparing( Column::getColumnName ); public static final Comparator CLIENT_INFO_PROPERTY_COMPARATOR = Comparator diff --git a/src/main/java/org/polypheny/jdbc/meta/MetaResultSetSignatures.java b/src/main/java/org/polypheny/jdbc/meta/MetaResultSetSignatures.java index af12e909..20bb1bd6 100644 --- a/src/main/java/org/polypheny/jdbc/meta/MetaResultSetSignatures.java +++ b/src/main/java/org/polypheny/jdbc/meta/MetaResultSetSignatures.java @@ -25,7 +25,7 @@ public class MetaResultSetSignatures { public static final List> TABLE_SIGNATURE = Arrays.asList( - new MetaResultSetParameter<>( "TABLE_CAT", Types.VARCHAR, Table::getSourceDatabaseName ), + //new MetaResultSetParameter<>( "TABLE_CAT", Types.VARCHAR, Table::getSourceDatabaseName ), new MetaResultSetParameter<>( "TABLE_SCHEM", Types.VARCHAR, Table::getNamespaceName ), new MetaResultSetParameter<>( "TABLE_NAME", Types.VARCHAR, Table::getTableName ), new MetaResultSetParameter<>( "TABLE_TYPE", Types.VARCHAR, Table::getTableType ), @@ -34,8 +34,8 @@ public class MetaResultSetSignatures { new MetaResultSetParameter<>( "TYPE_SCHEM", Types.VARCHAR, p -> null ), new MetaResultSetParameter<>( "TYPE_NAME", Types.VARCHAR, p -> null ), new MetaResultSetParameter<>( "SELF_REFERENCING_COL_NAME", Types.VARCHAR, p -> null ), - new MetaResultSetParameter<>( "REF_GENERATION", Types.VARCHAR, p -> null ), - new MetaResultSetParameter<>( "OWNER", Types.VARCHAR, Table::getOwnerName ) + new MetaResultSetParameter<>( "REF_GENERATION", Types.VARCHAR, p -> null ) + //new MetaResultSetParameter<>( "OWNER", Types.VARCHAR, Table::getOwnerName ) ); public static final List> TABLE_TYPE_SIGNATURE = Collections.singletonList( @@ -44,13 +44,13 @@ public class MetaResultSetSignatures { public static final List> NAMESPACE_SIGNATURE = Arrays.asList( new MetaResultSetParameter<>( "TABLE_SCHEM", Types.VARCHAR, Namespace::getNamespaceName ), - new MetaResultSetParameter<>( "TABLE_CATALOG", Types.VARCHAR, Namespace::getDatabaseName ), - new MetaResultSetParameter<>( "OWNER", Types.VARCHAR, Namespace::getOwnerName ), + //new MetaResultSetParameter<>( "TABLE_CATALOG", Types.VARCHAR, Namespace::getDatabaseName ), + //new MetaResultSetParameter<>( "OWNER", Types.VARCHAR, Namespace::getOwnerName ), new MetaResultSetParameter<>( "SCHEMA_TYPE", Types.VARCHAR, nullIfFalse( Namespace::getNamespaceName, Namespace::hasNamespaceType ) ) ); public static final List> COLUMN_SIGNATURE = Arrays.asList( - new MetaResultSetParameter<>( "TABLE_CAT", Types.VARCHAR, Column::getDatabaseName ), + //new MetaResultSetParameter<>( "TABLE_CAT", Types.VARCHAR, Column::getDatabaseName ), new MetaResultSetParameter<>( "TABLE_SCHEM", Types.VARCHAR, Column::getNamespaceName ), new MetaResultSetParameter<>( "TABLE_NAME", Types.VARCHAR, Column::getTableName ), new MetaResultSetParameter<>( "COLUMN_NAME", Types.VARCHAR, Column::getColumnName ), @@ -269,7 +269,7 @@ public class MetaResultSetSignatures { ); public static final List> PSEUDO_COLUMN_SIGNATURE = Arrays.asList( - new MetaResultSetParameter<>( "TABLE_CAT", Types.VARCHAR, Column::getDatabaseName ), + //new MetaResultSetParameter<>( "TABLE_CAT", Types.VARCHAR, Column::getDatabaseName ), new MetaResultSetParameter<>( "TABLE_SCHEM", Types.VARCHAR, Column::getNamespaceName ), new MetaResultSetParameter<>( "TABLE_NAME", Types.VARCHAR, Column::getTableName ), new MetaResultSetParameter<>( "COLUMN_NAME", Types.VARCHAR, Column::getColumnName ), diff --git a/src/main/java/org/polypheny/jdbc/meta/PolyphenyDatabaseMetadata.java b/src/main/java/org/polypheny/jdbc/meta/PolyphenyDatabaseMetadata.java index 061beb7b..39e19f15 100644 --- a/src/main/java/org/polypheny/jdbc/meta/PolyphenyDatabaseMetadata.java +++ b/src/main/java/org/polypheny/jdbc/meta/PolyphenyDatabaseMetadata.java @@ -1045,9 +1045,6 @@ private boolean referencesTable( ForeignKey foreignKey, Table table ) { if ( !foreignKey.getReferencedNamespaceName().equals( table.getNamespaceName() ) ) { return false; } - if ( !foreignKey.getReferencedDatabaseName().equals( table.getSourceDatabaseName() ) ) { - return false; - } return true; }