diff --git a/csharp/test/Drivers/Interop/Snowflake/DriverTests.cs b/csharp/test/Drivers/Interop/Snowflake/DriverTests.cs index 55535be6aa..fff5723300 100644 --- a/csharp/test/Drivers/Interop/Snowflake/DriverTests.cs +++ b/csharp/test/Drivers/Interop/Snowflake/DriverTests.cs @@ -83,12 +83,6 @@ public DriverTests() Dictionary options = new Dictionary(); _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); } /// @@ -258,8 +253,7 @@ public void CanGetObjectsAll() using RecordBatch recordBatch = stream.ReadNextRecordBatchAsync().Result; List catalogs = GetObjectsParser.ParseCatalog(recordBatch, databaseName, schemaName); - - List columns = catalogs + AdbcTable table = catalogs .Where(c => string.Equals(c.Name, databaseName)) .Select(c => c.DbSchemas) .FirstOrDefault() @@ -267,9 +261,13 @@ public void CanGetObjectsAll() .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 columns = table.Columns; + Assert.True(columns != null, "Columns cannot be null"); Assert.Equal(_testConfiguration.Metadata.ExpectedColumnCount, columns.Count);