Changeset: cf816a9ad544 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/cf816a9ad544 Branch: default Log Message:
Merged again with Jul2021 (I messed it up I know) diffs (32 lines): diff --git a/clients/odbc/driver/SQLSpecialColumns.c b/clients/odbc/driver/SQLSpecialColumns.c --- a/clients/odbc/driver/SQLSpecialColumns.c +++ b/clients/odbc/driver/SQLSpecialColumns.c @@ -221,7 +221,7 @@ MNDBSpecialColumns(ODBCStmt *stmt, "sys.tables t, " "sys.columns c, " "sys.keys k, " - "sys.objects kc" + "sys.objects kc " "where s.id = t.schema_id and " "t.id = c.table_id and " "t.id = k.table_id and " diff --git a/sql/test/prepare/Tests/sqlancer_prepare.stable.out b/sql/test/prepare/Tests/sqlancer_prepare.stable.out --- a/sql/test/prepare/Tests/sqlancer_prepare.stable.out +++ b/sql/test/prepare/Tests/sqlancer_prepare.stable.out @@ -131,14 +131,14 @@ % .prepare, .prepare, .prepare, .prepare, .prepare, .prepare # table_name % type, digits, scale, schema, table, column # name % varchar, int, int, str, str, str # type -% 7, 2, 1, 0, 2, 2 # length +% 7, 2, 1, 0, 3, 3 # length [ "boolean", 1, 0, "", "%11", "%11" ] [ "decimal", 16, 6, NULL, NULL, NULL ] #PREPARE SELECT "quarter"(date '2021-01-02') IN ("second"(TIME '01:00:00'), (select ? where true)); % .prepare, .prepare, .prepare, .prepare, .prepare, .prepare # table_name % type, digits, scale, schema, table, column # name % varchar, int, int, str, str, str # type -% 7, 2, 1, 0, 2, 2 # length +% 7, 2, 1, 0, 3, 3 # length [ "boolean", 1, 0, "", "%11", "%11" ] [ "decimal", 16, 6, NULL, NULL, NULL ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list