Skip to content

Commit

Permalink
removed white space changes
Browse files Browse the repository at this point in the history
  • Loading branch information
ryan-syed committed Jan 11, 2024
1 parent 65a99d6 commit 721f3b0
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
5 changes: 0 additions & 5 deletions go/adbc/driver/snowflake/connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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 != "" {
Expand Down
2 changes: 1 addition & 1 deletion go/adbc/driver/snowflake/connection_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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")
}

Expand Down

0 comments on commit 721f3b0

Please sign in to comment.