lidavidm commented on code in PR #2965:
URL: https://github.com/apache/arrow-adbc/pull/2965#discussion_r2148856333
##########
go/adbc/driver/snowflake/driver_test.go:
##########
@@ -1724,6 +1724,100 @@ func (suite *SnowflakeTests) TestBooleanType() {
}
}
+func (suite *SnowflakeTests) TestTimestampPrecisionJson() {
+ opts := suite.Quirks.DatabaseOptions()
+ opts[driver.OptionMaxTimestampPrecision] = "microseconds"
+
+ db, err := suite.driver.NewDatabase(opts)
+ suite.NoError(err)
+ defer validation.CheckedClose(suite.T(), db)
+ cnxn, err := db.Open(suite.ctx)
+ suite.NoError(err)
+ defer validation.CheckedClose(suite.T(), cnxn)
+ stmt, _ := cnxn.NewStatement()
+
+ id := uuid.New()
+ tempTable := "pk_" + strings.ReplaceAll(id.String(), "-", "")
+
+ query := fmt.Sprintf(`CREATE OR REPLACE TABLE %s.%s.%s (
+ id INT PRIMARY KEY,
+ name STRING);`, suite.Quirks.catalogName, suite.Quirks.schemaName,
tempTable)
+
+ suite.Require().NoError(stmt.SetSqlQuery(query))
+ _, err = stmt.ExecuteUpdate(suite.ctx)
+ suite.Require().NoError(err)
+
+ query = fmt.Sprintf("SHOW PRIMARY KEYS IN TABLE %s.%s.%s",
suite.Quirks.catalogName, suite.Quirks.schemaName, tempTable)
+ stmt, _ = cnxn.NewStatement()
+ suite.Require().NoError(stmt.SetSqlQuery(query))
+ rdr, _, err := stmt.ExecuteQuery(suite.ctx)
+ defer rdr.Release()
+ suite.Require().NoError(err)
+
+ suite.True(rdr.Next())
+ rec := rdr.Record()
+
+ suite.True(rec.NumRows() == 1)
+
+ // Get column indexes
+ getColIdx := func(name string) int {
+ for i := 0; i < int(rec.NumCols()); i++ {
+ if rec.ColumnName(i) == name {
+ return i
+ }
+ }
+ return -1
+ }
+
+ // Expected column names
+ dbIdx := getColIdx("database_name")
+ schemaIdx := getColIdx("schema_name")
+ tableIdx := getColIdx("table_name")
+ colIdx := getColIdx("column_name")
+ seqIdx := getColIdx("key_sequence")
+ createdIdx := getColIdx("created_on")
+
+ if dbIdx == -1 || schemaIdx == -1 || tableIdx == -1 || colIdx == -1 ||
seqIdx == -1 || createdIdx == -1 {
Review Comment:
suite.Equal instead of panic?
Or just panic inside of getColIndex with the column name.
##########
go/adbc/driver/snowflake/driver_test.go:
##########
@@ -1724,6 +1724,100 @@ func (suite *SnowflakeTests) TestBooleanType() {
}
}
+func (suite *SnowflakeTests) TestTimestampPrecisionJson() {
+ opts := suite.Quirks.DatabaseOptions()
+ opts[driver.OptionMaxTimestampPrecision] = "microseconds"
+
+ db, err := suite.driver.NewDatabase(opts)
+ suite.NoError(err)
+ defer validation.CheckedClose(suite.T(), db)
+ cnxn, err := db.Open(suite.ctx)
+ suite.NoError(err)
+ defer validation.CheckedClose(suite.T(), cnxn)
+ stmt, _ := cnxn.NewStatement()
+
+ id := uuid.New()
+ tempTable := "pk_" + strings.ReplaceAll(id.String(), "-", "")
+
+ query := fmt.Sprintf(`CREATE OR REPLACE TABLE %s.%s.%s (
+ id INT PRIMARY KEY,
+ name STRING);`, suite.Quirks.catalogName, suite.Quirks.schemaName,
tempTable)
+
+ suite.Require().NoError(stmt.SetSqlQuery(query))
+ _, err = stmt.ExecuteUpdate(suite.ctx)
+ suite.Require().NoError(err)
+
+ query = fmt.Sprintf("SHOW PRIMARY KEYS IN TABLE %s.%s.%s",
suite.Quirks.catalogName, suite.Quirks.schemaName, tempTable)
+ stmt, _ = cnxn.NewStatement()
+ suite.Require().NoError(stmt.SetSqlQuery(query))
+ rdr, _, err := stmt.ExecuteQuery(suite.ctx)
+ defer rdr.Release()
+ suite.Require().NoError(err)
+
+ suite.True(rdr.Next())
+ rec := rdr.Record()
+
+ suite.True(rec.NumRows() == 1)
+
+ // Get column indexes
+ getColIdx := func(name string) int {
+ for i := 0; i < int(rec.NumCols()); i++ {
+ if rec.ColumnName(i) == name {
+ return i
+ }
+ }
+ return -1
+ }
+
+ // Expected column names
+ dbIdx := getColIdx("database_name")
+ schemaIdx := getColIdx("schema_name")
+ tableIdx := getColIdx("table_name")
+ colIdx := getColIdx("column_name")
+ seqIdx := getColIdx("key_sequence")
+ createdIdx := getColIdx("created_on")
+
+ if dbIdx == -1 || schemaIdx == -1 || tableIdx == -1 || colIdx == -1 ||
seqIdx == -1 || createdIdx == -1 {
+ panic("Missing expected columns")
+ }
+
+ i := 0
+ dbName := rec.Column(dbIdx).(*array.String).Value(i)
+ schema := rec.Column(schemaIdx).(*array.String).Value(i)
+ tbl := rec.Column(tableIdx).(*array.String).Value(i)
+ column := rec.Column(colIdx).(*array.String).Value(i)
+ keySeq := rec.Column(seqIdx).(*array.Int64).Value(i)
+
+ // Created_on should be a timestamp array
+ createdCol := rec.Column(createdIdx).(*array.Timestamp)
+ created := time.Unix(0,
int64(createdCol.Value(i))*int64(time.Microsecond)).UTC()
+
+ // Perform checks
+ if strings.EqualFold(dbName, suite.Quirks.catalogName) &&
+ strings.EqualFold(schema, suite.Quirks.schemaName) &&
+ strings.EqualFold(tbl, tempTable) &&
+ strings.EqualFold(column, "id") &&
+ keySeq == 1 {
+
+ now := time.Now().UTC()
+ diff := now.Sub(created)
+ if diff < 0 {
+ diff = -diff
+ }
+ // since this was just created, make sure the times are within
a short difference
+ suite.Assert().True(diff <= 2*time.Minute)
+ } else {
+ panic("Invalid values")
+ }
+
+ query = fmt.Sprintf("DROP TABLE %s.%s.%s", suite.Quirks.catalogName,
suite.Quirks.schemaName, tempTable)
+ stmt, _ = cnxn.NewStatement()
Review Comment:
This isn't being cleaned up, though I suppose it doesn't seem to matter
##########
go/adbc/driver/snowflake/driver_test.go:
##########
@@ -1724,6 +1724,100 @@ func (suite *SnowflakeTests) TestBooleanType() {
}
}
+func (suite *SnowflakeTests) TestTimestampPrecisionJson() {
+ opts := suite.Quirks.DatabaseOptions()
+ opts[driver.OptionMaxTimestampPrecision] = "microseconds"
+
+ db, err := suite.driver.NewDatabase(opts)
+ suite.NoError(err)
+ defer validation.CheckedClose(suite.T(), db)
+ cnxn, err := db.Open(suite.ctx)
+ suite.NoError(err)
+ defer validation.CheckedClose(suite.T(), cnxn)
+ stmt, _ := cnxn.NewStatement()
+
+ id := uuid.New()
+ tempTable := "pk_" + strings.ReplaceAll(id.String(), "-", "")
+
+ query := fmt.Sprintf(`CREATE OR REPLACE TABLE %s.%s.%s (
+ id INT PRIMARY KEY,
+ name STRING);`, suite.Quirks.catalogName, suite.Quirks.schemaName,
tempTable)
+
+ suite.Require().NoError(stmt.SetSqlQuery(query))
+ _, err = stmt.ExecuteUpdate(suite.ctx)
+ suite.Require().NoError(err)
+
+ query = fmt.Sprintf("SHOW PRIMARY KEYS IN TABLE %s.%s.%s",
suite.Quirks.catalogName, suite.Quirks.schemaName, tempTable)
+ stmt, _ = cnxn.NewStatement()
+ suite.Require().NoError(stmt.SetSqlQuery(query))
+ rdr, _, err := stmt.ExecuteQuery(suite.ctx)
+ defer rdr.Release()
+ suite.Require().NoError(err)
+
+ suite.True(rdr.Next())
+ rec := rdr.Record()
+
+ suite.True(rec.NumRows() == 1)
+
+ // Get column indexes
+ getColIdx := func(name string) int {
+ for i := 0; i < int(rec.NumCols()); i++ {
+ if rec.ColumnName(i) == name {
+ return i
+ }
+ }
+ return -1
+ }
+
+ // Expected column names
+ dbIdx := getColIdx("database_name")
+ schemaIdx := getColIdx("schema_name")
+ tableIdx := getColIdx("table_name")
+ colIdx := getColIdx("column_name")
+ seqIdx := getColIdx("key_sequence")
+ createdIdx := getColIdx("created_on")
+
+ if dbIdx == -1 || schemaIdx == -1 || tableIdx == -1 || colIdx == -1 ||
seqIdx == -1 || createdIdx == -1 {
+ panic("Missing expected columns")
+ }
+
+ i := 0
+ dbName := rec.Column(dbIdx).(*array.String).Value(i)
+ schema := rec.Column(schemaIdx).(*array.String).Value(i)
+ tbl := rec.Column(tableIdx).(*array.String).Value(i)
+ column := rec.Column(colIdx).(*array.String).Value(i)
+ keySeq := rec.Column(seqIdx).(*array.Int64).Value(i)
+
+ // Created_on should be a timestamp array
+ createdCol := rec.Column(createdIdx).(*array.Timestamp)
+ created := time.Unix(0,
int64(createdCol.Value(i))*int64(time.Microsecond)).UTC()
+
+ // Perform checks
+ if strings.EqualFold(dbName, suite.Quirks.catalogName) &&
+ strings.EqualFold(schema, suite.Quirks.schemaName) &&
+ strings.EqualFold(tbl, tempTable) &&
+ strings.EqualFold(column, "id") &&
+ keySeq == 1 {
+
+ now := time.Now().UTC()
+ diff := now.Sub(created)
+ if diff < 0 {
+ diff = -diff
+ }
+ // since this was just created, make sure the times are within
a short difference
+ suite.Assert().True(diff <= 2*time.Minute)
+ } else {
+ panic("Invalid values")
+ }
+
+ query = fmt.Sprintf("DROP TABLE %s.%s.%s", suite.Quirks.catalogName,
suite.Quirks.schemaName, tempTable)
+ stmt, _ = cnxn.NewStatement()
+ suite.Require().NoError(stmt.SetSqlQuery(query))
+ _, err = stmt.ExecuteUpdate(suite.ctx)
+ defer rdr.Release()
Review Comment:
Isn't this a double release? And why is it all the way down here?
##########
go/adbc/driver/snowflake/driver_test.go:
##########
@@ -1724,6 +1724,100 @@ func (suite *SnowflakeTests) TestBooleanType() {
}
}
+func (suite *SnowflakeTests) TestTimestampPrecisionJson() {
+ opts := suite.Quirks.DatabaseOptions()
+ opts[driver.OptionMaxTimestampPrecision] = "microseconds"
+
+ db, err := suite.driver.NewDatabase(opts)
+ suite.NoError(err)
+ defer validation.CheckedClose(suite.T(), db)
+ cnxn, err := db.Open(suite.ctx)
+ suite.NoError(err)
+ defer validation.CheckedClose(suite.T(), cnxn)
+ stmt, _ := cnxn.NewStatement()
+
+ id := uuid.New()
+ tempTable := "pk_" + strings.ReplaceAll(id.String(), "-", "")
+
+ query := fmt.Sprintf(`CREATE OR REPLACE TABLE %s.%s.%s (
+ id INT PRIMARY KEY,
+ name STRING);`, suite.Quirks.catalogName, suite.Quirks.schemaName,
tempTable)
+
+ suite.Require().NoError(stmt.SetSqlQuery(query))
+ _, err = stmt.ExecuteUpdate(suite.ctx)
+ suite.Require().NoError(err)
+
+ query = fmt.Sprintf("SHOW PRIMARY KEYS IN TABLE %s.%s.%s",
suite.Quirks.catalogName, suite.Quirks.schemaName, tempTable)
+ stmt, _ = cnxn.NewStatement()
+ suite.Require().NoError(stmt.SetSqlQuery(query))
+ rdr, _, err := stmt.ExecuteQuery(suite.ctx)
+ defer rdr.Release()
+ suite.Require().NoError(err)
+
+ suite.True(rdr.Next())
+ rec := rdr.Record()
+
+ suite.True(rec.NumRows() == 1)
Review Comment:
suite.Equal?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]