Skip to content

Commit 6f87305

Browse files
authoredMay 17, 2018
Reverting back the table exists change for snowflake (Netflix#257)
1 parent 7d6f685 commit 6f87305

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed
 

‎metacat-connector-jdbc/src/main/java/com/netflix/metacat/connector/jdbc/services/JdbcConnectorTableService.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ public List<QualifiedName> listNames(
195195

196196
try (Connection connection = this.getConnection(database)) {
197197
final List<QualifiedName> names = Lists.newArrayList();
198-
try (ResultSet tables = this.getTables(connection, name, prefix, null)) {
198+
try (ResultSet tables = this.getTables(connection, name, prefix)) {
199199
while (tables.next()) {
200200
names.add(QualifiedName.ofTable(catalog, database, tables.getString("TABLE_NAME")));
201201
}
@@ -275,7 +275,8 @@ public boolean exists(@Nonnull final ConnectorRequestContext context, @Nonnull f
275275
try (Connection connection = this.dataSource.getConnection()) {
276276
final String databaseName = name.getDatabaseName();
277277
connection.setSchema(databaseName);
278-
final ResultSet rs = getTables(connection, name, null, name.getTableName());
278+
final DatabaseMetaData metaData = connection.getMetaData();
279+
final ResultSet rs = metaData.getTables(databaseName, databaseName, name.getTableName(), TABLE_TYPE);
279280
if (rs.next()) {
280281
result = true;
281282
}
@@ -292,20 +293,18 @@ public boolean exists(@Nonnull final ConnectorRequestContext context, @Nonnull f
292293
* @param connection The database connection to use
293294
* @param name The qualified name of the database to get tables for
294295
* @param prefix An optional database table name prefix to search for
295-
* @param tableNamePattern The table name pattern
296296
* @return The result set with columns as described in the getTables method from java.sql.DatabaseMetaData
297297
* @throws SQLException on query error
298298
*/
299299
protected ResultSet getTables(
300300
@Nonnull @NonNull final Connection connection,
301301
@Nonnull @NonNull final QualifiedName name,
302-
@Nullable final QualifiedName prefix,
303-
@Nullable final String tableNamePattern
302+
@Nullable final QualifiedName prefix
304303
) throws SQLException {
305304
final String database = name.getDatabaseName();
306305
final DatabaseMetaData metaData = connection.getMetaData();
307306
return prefix == null || StringUtils.isEmpty(prefix.getTableName())
308-
? metaData.getTables(database, database, tableNamePattern, TABLE_TYPES)
307+
? metaData.getTables(database, database, null, TABLE_TYPES)
309308
: metaData
310309
.getTables(
311310
database,

‎metacat-connector-snowflake/src/main/java/com/netflix/metacat/connector/snowflake/SnowflakeConnectorTableService.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public void rename(@Nonnull final ConnectorRequestContext context,
131131
@Nonnull final QualifiedName newName) {
132132
super.rename(context, getSnowflakeName(oldName), getSnowflakeName(newName));
133133
}
134-
134+
135135
@Override
136136
protected Connection getConnection(@Nonnull @NonNull final String schema) throws SQLException {
137137
final Connection connection = this.dataSource.getConnection();
@@ -192,13 +192,12 @@ protected void setTableInfoDetails(final Connection connection, final TableInfo
192192
protected ResultSet getTables(
193193
@Nonnull @NonNull final Connection connection,
194194
@Nonnull @NonNull final QualifiedName name,
195-
@Nullable final QualifiedName prefix,
196-
@Nullable final String tablePattern
195+
@Nullable final QualifiedName prefix
197196
) throws SQLException {
198197
final String schema = name.getDatabaseName();
199198
final DatabaseMetaData metaData = connection.getMetaData();
200199
return prefix == null || StringUtils.isEmpty(prefix.getTableName())
201-
? metaData.getTables(connection.getCatalog(), schema, tablePattern, TABLE_TYPES)
200+
? metaData.getTables(connection.getCatalog(), schema, null, TABLE_TYPES)
202201
: metaData
203202
.getTables(
204203
connection.getCatalog(),

0 commit comments

Comments
 (0)
Please sign in to comment.