From 721f3b017f4c19eac462d2d8331a29f56754ffaf Mon Sep 17 00:00:00 2001 From: Ryan Syed Date: Thu, 11 Jan 2024 09:40:18 -0800 Subject: [PATCH] removed white space changes --- go/adbc/driver/snowflake/connection.go | 5 ----- go/adbc/driver/snowflake/connection_test.go | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/go/adbc/driver/snowflake/connection.go b/go/adbc/driver/snowflake/connection.go index dba28fc6b7..73c31604de 100644 --- a/go/adbc/driver/snowflake/connection.go +++ b/go/adbc/driver/snowflake/connection.go @@ -590,7 +590,6 @@ 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) } @@ -610,7 +609,6 @@ 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) } @@ -630,7 +628,6 @@ 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) } @@ -691,7 +688,6 @@ 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 } @@ -741,7 +737,6 @@ 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 != "" { diff --git a/go/adbc/driver/snowflake/connection_test.go b/go/adbc/driver/snowflake/connection_test.go index e69675dcab..983a206d88 100644 --- a/go/adbc/driver/snowflake/connection_test.go +++ b/go/adbc/driver/snowflake/connection_test.go @@ -43,7 +43,6 @@ func TestPrepareDbSchemasSQLWithNoFilterOneCatalog(t *testing.T) { ( SELECT * FROM "DEMO_DB".INFORMATION_SCHEMA.SCHEMATA )` - actual, queryArgs := prepareDbSchemasSQL(catalogNames[:], &catalogPattern, &schemaPattern) println("Query Args", queryArgs) @@ -148,6 +147,7 @@ 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") }