refactor(csharp/test/Drivers/Interop/Snowflake): Updated the metadata tests to work without the db name

csharp/test/Drivers/Interop/Snowflake/DriverTests.cs

@@ -83,12 +83,6 @@ public DriverTests()
             Dictionary<string, string> options = new Dictionary<string, string>();
             _snowflakeDriver = SnowflakeTestingUtils.GetSnowflakeAdbcDriver(_testConfiguration, out parameters);
 
-            string databaseName = _testConfiguration.Metadata.Catalog;
-            string schemaName = _testConfiguration.Metadata.Schema;
-
-            parameters[SnowflakeParameters.DATABASE] = databaseName;
-            parameters[SnowflakeParameters.SCHEMA] = schemaName;
-
             _database = _snowflakeDriver.Open(parameters);
             _connection = _database.Connect(options);
         }
@@ -212,7 +206,7 @@ public void CanGetObjectsTables(string tableNamePattern)
             string tableName = _testConfiguration.Metadata.Table;
 
             using IArrowArrayStream stream = _connection.GetObjects(
-                    depth: AdbcConnection.GetObjectsDepth.All,
+                    depth: AdbcConnection.GetObjectsDepth.Tables,
                     catalogPattern: databaseName,
                     dbSchemaPattern: schemaName,
                     tableNamePattern: tableNamePattern,
@@ -233,6 +227,7 @@ public void CanGetObjectsTables(string tableNamePattern)
 
             AdbcTable table = tables.Where((table) => string.Equals(table.Name, tableName)).FirstOrDefault();
             Assert.True(table != null, "table should not be null");
+            Assert.Equal("BASE TABLE", table.Type);
         }
 
         /// <summary>
@@ -258,18 +253,21 @@ public void CanGetObjectsAll()
             using RecordBatch recordBatch = stream.ReadNextRecordBatchAsync().Result;
 
             List<AdbcCatalog> catalogs = GetObjectsParser.ParseCatalog(recordBatch, databaseName, schemaName);
-
-            List<AdbcColumn> columns = catalogs
+            AdbcTable table = catalogs
                 .Where(c => string.Equals(c.Name, databaseName))
                 .Select(c => c.DbSchemas)
                 .FirstOrDefault()
                 .Where(s => string.Equals(s.Name, schemaName))
                 .Select(s => s.Tables)
                 .FirstOrDefault()
                 .Where(t => string.Equals(t.Name, tableName))
-                .Select(t => t.Columns)
                 .FirstOrDefault();
 
+
+            Assert.True(table != null, "table should not be null");
+            Assert.Equal("BASE TABLE", table.Type);
+            List<AdbcColumn> columns = table.Columns;
+
             Assert.True(columns != null, "Columns cannot be null");
             Assert.Equal(_testConfiguration.Metadata.ExpectedColumnCount, columns.Count);
 

go/adbc/driver/snowflake/connection.go

@@ -590,6 +590,7 @@ func (c *cnxn) getDbSchemasMetadata(ctx context.Context, matchingCatalogNames []
 	var metadataRecords []internal.Metadata
 	query, queryArgs := prepareDbSchemasSQL(matchingCatalogNames, catalog, dbSchema)
 	rows, err := c.sqldb.QueryContext(ctx, query, queryArgs...)
+
 	if err != nil {
 		return nil, errToAdbcErr(adbc.StatusIO, err)
 	}
@@ -609,6 +610,7 @@ func (c *cnxn) getTablesMetadata(ctx context.Context, matchingCatalogNames []str
 	metadataRecords := make([]internal.Metadata, 0)
 	query, queryArgs := prepareTablesSQL(matchingCatalogNames, catalog, dbSchema, tableName, tableType)
 	rows, err := c.sqldb.QueryContext(ctx, query, queryArgs...)
+
 	if err != nil {
 		return nil, errToAdbcErr(adbc.StatusIO, err)
 	}
@@ -628,6 +630,7 @@ func (c *cnxn) getColumnsMetadata(ctx context.Context, matchingCatalogNames []st
 	metadataRecords := make([]internal.Metadata, 0)
 	query, queryArgs := prepareColumnsSQL(matchingCatalogNames, catalog, dbSchema, tableName, columnName, tableType)
 	rows, err := c.sqldb.QueryContext(ctx, query, queryArgs...)
+
 	if err != nil {
 		return nil, errToAdbcErr(adbc.StatusIO, err)
 	}
@@ -688,6 +691,7 @@ func prepareDbSchemasSQL(matchingCatalogNames []string, catalog *string, dbSchem
 
 	query = `SELECT CATALOG_NAME, SCHEMA_NAME FROM (` + query + `)`
 	conditions, queryArgs := prepareFilterConditions(adbc.ObjectDepthDBSchemas, catalog, dbSchema, nil, nil, make([]string, 0))
+
 	if conditions != "" {
 		query += " WHERE " + conditions
 	}
@@ -737,6 +741,7 @@ func prepareColumnsSQL(matchingCatalogNames []string, catalog *string, dbSchema
 						character_maximum_length, character_octet_length, datetime_precision, comment FROM (` + prefixQuery + `)`
 	ordering := ` ORDER BY table_catalog, table_schema, table_name, ordinal_position`
 	conditions, queryArgs := prepareFilterConditions(adbc.ObjectDepthColumns, catalog, dbSchema, tableName, columnName, tableType)
+
 	query := prefixQuery
 
 	if conditions != "" {

go/adbc/driver/snowflake/connection_test.go

@@ -43,6 +43,7 @@ func TestPrepareDbSchemasSQLWithNoFilterOneCatalog(t *testing.T) {
 					(
 						SELECT * FROM "DEMO_DB".INFORMATION_SCHEMA.SCHEMATA
 					)`
+
 	actual, queryArgs := prepareDbSchemasSQL(catalogNames[:], &catalogPattern, &schemaPattern)
 
 	println("Query Args", queryArgs)
@@ -147,7 +148,6 @@ func TestPrepareDbSchemasSQL(t *testing.T) {
 	}
 
 	assert.True(t, areStringsEquivalent(catalogPattern+","+schemaPattern, strings.Join(stringqueryArgs, ",")), "The expected SCHEMA_NAME is not being generated")
-
 	assert.True(t, areStringsEquivalent(expected, actual), "The expected SQL query for DbSchemas is not being generated")
 }