Changeset: cd944d22696a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/cd944d22696a
Modified Files:
sql/backends/monet5/rel_bin.c
sql/server/rel_select.c
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.test
sql/test/file_loader/Tests/file_loader_function.test
sql/test/pg_regress/Tests/int8.test
testing/sqllogictest.py
Branch: default
Log Message:
Merge cleanup_types into default.
diffs (truncated from 34826 to 300 lines):
diff --git a/clients/odbc/tests/ODBCmetadata.c
b/clients/odbc/tests/ODBCmetadata.c
--- a/clients/odbc/tests/ODBCmetadata.c
+++ b/clients/odbc/tests/ODBCmetadata.c
@@ -608,13 +608,13 @@ main(int argc, char **argv)
"Resultset with 18 columns\n"
"Resultset with 7 rows\n"
"TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME
DATA_TYPE TYPE_NAME COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS
NUM_PREC_RADIX NULLABLE REMARKS COLUMN_DEF SQL_DATA_TYPE
SQL_DATETIME_SUB CHAR_OCTET_LENGTH ORDINAL_POSITION
IS_NULLABLE\n"
- "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
SMALLINT WCHAR(25) INTEGER INTEGER SMALLINT SMALLINT
SMALLINT WVARCHAR(65000) WVARCHAR(2048) SMALLINT SMALLINT
INTEGER INTEGER WVARCHAR(3)\n"
- "NULL odbctst nopk_twoucs id2 4 INTEGER 32
11 0 2 0 odbctst.nopk_twoucs.id2 column comment NULL
4 NULL NULL 1 NO\n"
+ "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
SMALLINT WVARCHAR(25) INTEGER INTEGER SMALLINT SMALLINT
SMALLINT WVARCHAR(65000) WVARCHAR(2048) SMALLINT SMALLINT
INTEGER INTEGER WVARCHAR(3)\n"
+ "NULL odbctst nopk_twoucs id2 4 INTEGER 31
11 0 2 0 odbctst.nopk_twoucs.id2 column comment NULL
4 NULL NULL 1 NO\n"
"NULL odbctst nopk_twoucs name2 -9 VARCHAR 99
198 NULL NULL 1 odbctst.nopk_twoucs.name2 column comment
NULL -9 NULL 396 2 YES\n"
- "NULL odbctst pk2c pkc1 4 INTEGER 32 11
0 2 0 NULL NULL 4 NULL NULL 1 NO\n"
+ "NULL odbctst pk2c pkc1 4 INTEGER 31 11
0 2 0 NULL NULL 4 NULL NULL 1 NO\n"
"NULL odbctst pk2c pkc2 -9 VARCHAR 99 198
NULL NULL 0 NULL NULL -9 NULL 396 2 NO\n"
"NULL odbctst pk2c name1 -9 VARCHAR 99 198
NULL NULL 1 NULL NULL -9 NULL 396 3 YES\n"
- "NULL odbctst pk_uc id1 4 INTEGER 32 11
0 2 0 NULL NULL 4 NULL NULL 1 NO\n"
+ "NULL odbctst pk_uc id1 4 INTEGER 31 11
0 2 0 NULL NULL 4 NULL NULL 1 NO\n"
"NULL odbctst pk_uc name1 -9 VARCHAR 99 198
NULL NULL 1 NULL NULL -9 NULL 396 2 YES\n");
// All columns of all tmp tables containg 'pk' in their name
@@ -625,14 +625,14 @@ main(int argc, char **argv)
"Resultset with 18 columns\n"
"Resultset with 8 rows\n"
"TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME
DATA_TYPE TYPE_NAME COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS
NUM_PREC_RADIX NULLABLE REMARKS COLUMN_DEF SQL_DATA_TYPE
SQL_DATETIME_SUB CHAR_OCTET_LENGTH ORDINAL_POSITION
IS_NULLABLE\n"
- "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
SMALLINT WCHAR(25) INTEGER INTEGER SMALLINT SMALLINT
SMALLINT WVARCHAR(65000) WVARCHAR(2048) SMALLINT SMALLINT
INTEGER INTEGER WVARCHAR(3)\n"
- "NULL tmp glbl_nopk_twoucs id2 4 INTEGER
32 11 0 2 0 NULL NULL 4 NULL NULL
1 NO\n"
+ "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
SMALLINT WVARCHAR(25) INTEGER INTEGER SMALLINT SMALLINT
SMALLINT WVARCHAR(65000) WVARCHAR(2048) SMALLINT SMALLINT
INTEGER INTEGER WVARCHAR(3)\n"
+ "NULL tmp glbl_nopk_twoucs id2 4 INTEGER
31 11 0 2 0 NULL NULL 4 NULL NULL
1 NO\n"
"NULL tmp glbl_nopk_twoucs name2 -9 VARCHAR
99 198 NULL NULL 1 NULL NULL -9 NULL 396
2 YES\n"
- "NULL tmp glbl_pk_uc id1 4 INTEGER 32
11 0 2 0 NULL NULL 4 NULL NULL 1
NO\n"
+ "NULL tmp glbl_pk_uc id1 4 INTEGER 31
11 0 2 0 NULL NULL 4 NULL NULL 1
NO\n"
"NULL tmp glbl_pk_uc name1 -9 VARCHAR 99
198 NULL NULL 1 NULL NULL -9 NULL 396 2
YES\n"
- "NULL tmp tmp_nopk_twoucs id2 4 INTEGER 32
11 0 2 0 NULL NULL 4 NULL NULL 1
NO\n"
+ "NULL tmp tmp_nopk_twoucs id2 4 INTEGER 31
11 0 2 0 NULL NULL 4 NULL NULL 1
NO\n"
"NULL tmp tmp_nopk_twoucs name2 -9 VARCHAR 99
198 NULL NULL 1 NULL NULL -9 NULL 396 2
YES\n"
- "NULL tmp tmp_pk_uc id1 4 INTEGER 32
11 0 2 0 NULL NULL 4 NULL NULL 1
NO\n"
+ "NULL tmp tmp_pk_uc id1 4 INTEGER 31
11 0 2 0 NULL NULL 4 NULL NULL 1
NO\n"
"NULL tmp tmp_pk_uc name1 -9 VARCHAR 99
198 NULL NULL 1 NULL NULL -9 NULL 396 2
YES\n");
// All columns of all tmp tables containg 'pk' in their name and the
column matching name_ pattern
@@ -643,7 +643,7 @@ main(int argc, char **argv)
"Resultset with 18 columns\n"
"Resultset with 4 rows\n"
"TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME
DATA_TYPE TYPE_NAME COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS
NUM_PREC_RADIX NULLABLE REMARKS COLUMN_DEF SQL_DATA_TYPE
SQL_DATETIME_SUB CHAR_OCTET_LENGTH ORDINAL_POSITION
IS_NULLABLE\n"
- "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
SMALLINT WCHAR(25) INTEGER INTEGER SMALLINT SMALLINT
SMALLINT WVARCHAR(65000) WVARCHAR(2048) SMALLINT SMALLINT
INTEGER INTEGER WVARCHAR(3)\n"
+ "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
SMALLINT WVARCHAR(25) INTEGER INTEGER SMALLINT SMALLINT
SMALLINT WVARCHAR(65000) WVARCHAR(2048) SMALLINT SMALLINT
INTEGER INTEGER WVARCHAR(3)\n"
"NULL tmp glbl_nopk_twoucs name2 -9 VARCHAR
99 198 NULL NULL 1 NULL NULL -9 NULL 396
2 YES\n"
"NULL tmp glbl_pk_uc name1 -9 VARCHAR 99
198 NULL NULL 1 NULL NULL -9 NULL 396 2
YES\n"
"NULL tmp tmp_nopk_twoucs name2 -9 VARCHAR 99
198 NULL NULL 1 NULL NULL -9 NULL 396 2
YES\n"
@@ -675,8 +675,8 @@ main(int argc, char **argv)
"Resultset with 8 columns\n"
"Resultset with 1 rows\n"
"SCOPE COLUMN_NAME DATA_TYPE TYPE_NAME
COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS PSEUDO_COLUMN\n"
- "SMALLINT WVARCHAR(1024) SMALLINT WCHAR(25)
INTEGER INTEGER SMALLINT SMALLINT\n"
- "1 table_type_id 5 SMALLINT 16 6
0 1\n");
+ "SMALLINT WVARCHAR(1024) SMALLINT WVARCHAR(25)
INTEGER INTEGER SMALLINT SMALLINT\n"
+ "1 table_type_id 5 SMALLINT 15 6
0 1\n");
ret = SQLStatistics(stmt, (SQLCHAR*)"", SQL_NTS,
(SQLCHAR*)"sys", SQL_NTS, (SQLCHAR*)"table_types",
SQL_NTS,
@@ -706,7 +706,7 @@ main(int argc, char **argv)
"Resultset with 7 columns\n"
"Resultset with 0 rows\n"
"TABLE_CAT TABLE_SCHEM TABLE_NAME GRANTOR GRANTEE
PRIVILEGE IS_GRANTABLE\n"
- "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024)
WCHAR(1024) WVARCHAR(40) WCHAR(3)\n");
+ "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
WVARCHAR(1024) WVARCHAR(40) WVARCHAR(3)\n");
ret = SQLColumnPrivileges(stmt, (SQLCHAR*)"", SQL_NTS,
(SQLCHAR*)"sys", SQL_NTS, (SQLCHAR*)"table_types",
SQL_NTS,
@@ -715,7 +715,7 @@ main(int argc, char **argv)
"Resultset with 8 columns\n"
"Resultset with 0 rows\n"
"TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME
GRANTOR GRANTEE PRIVILEGE IS_GRANTABLE\n"
- "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n");
+ "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(40) WVARCHAR(3)\n");
// odbctst.pk_uc
ret = SQLPrimaryKeys(stmt, (SQLCHAR*)"", SQL_NTS,
@@ -734,8 +734,8 @@ main(int argc, char **argv)
"Resultset with 8 columns\n"
"Resultset with 1 rows\n"
"SCOPE COLUMN_NAME DATA_TYPE TYPE_NAME
COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS PSEUDO_COLUMN\n"
- "SMALLINT WVARCHAR(1024) SMALLINT WCHAR(25)
INTEGER INTEGER SMALLINT SMALLINT\n"
- "1 id1 4 INTEGER 32 11 0 1\n");
+ "SMALLINT WVARCHAR(1024) SMALLINT WVARCHAR(25)
INTEGER INTEGER SMALLINT SMALLINT\n"
+ "1 id1 4 INTEGER 31 11 0 1\n");
ret = SQLSpecialColumns(stmt, SQL_ROWVER, (SQLCHAR*)"", SQL_NTS,
(SQLCHAR*)"odbctst", SQL_NTS, (SQLCHAR*)"pk_uc",
SQL_NTS,
@@ -776,7 +776,7 @@ main(int argc, char **argv)
"Resultset with 7 columns\n"
"Resultset with 4 rows\n"
"TABLE_CAT TABLE_SCHEM TABLE_NAME GRANTOR GRANTEE
PRIVILEGE IS_GRANTABLE\n"
- "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024)
WCHAR(1024) WVARCHAR(40) WCHAR(3)\n"
+ "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
WVARCHAR(1024) WVARCHAR(40) WVARCHAR(3)\n"
"NULL odbctst pk_uc _SYSTEM monetdb DELETE NO\n"
"NULL odbctst pk_uc _SYSTEM monetdb INSERT NO\n"
"NULL odbctst pk_uc monetdb PUBLIC SELECT NO\n"
@@ -789,7 +789,7 @@ main(int argc, char **argv)
"Resultset with 8 columns\n"
"Resultset with 0 rows\n"
"TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME
GRANTOR GRANTEE PRIVILEGE IS_GRANTABLE\n"
- "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n");
+ "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(40) WVARCHAR(3)\n");
// tmp.tmp_pk_uc
ret = SQLPrimaryKeys(stmt, (SQLCHAR*)"", SQL_NTS,
@@ -808,8 +808,8 @@ main(int argc, char **argv)
"Resultset with 8 columns\n"
"Resultset with 1 rows\n"
"SCOPE COLUMN_NAME DATA_TYPE TYPE_NAME
COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS PSEUDO_COLUMN\n"
- "SMALLINT WVARCHAR(1024) SMALLINT WCHAR(25)
INTEGER INTEGER SMALLINT SMALLINT\n"
- "1 id1 4 INTEGER 32 11 0 1\n");
+ "SMALLINT WVARCHAR(1024) SMALLINT WVARCHAR(25)
INTEGER INTEGER SMALLINT SMALLINT\n"
+ "1 id1 4 INTEGER 31 11 0 1\n");
ret = SQLStatistics(stmt, (SQLCHAR*)"", SQL_NTS,
(SQLCHAR*)"tmp", SQL_NTS, (SQLCHAR*)"tmp_pk_uc",
SQL_NTS,
@@ -841,7 +841,7 @@ main(int argc, char **argv)
"Resultset with 7 columns\n"
"Resultset with 2 rows\n"
"TABLE_CAT TABLE_SCHEM TABLE_NAME GRANTOR GRANTEE
PRIVILEGE IS_GRANTABLE\n"
- "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024)
WCHAR(1024) WVARCHAR(40) WCHAR(3)\n"
+ "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
WVARCHAR(1024) WVARCHAR(40) WVARCHAR(3)\n"
"NULL tmp tmp_pk_uc _SYSTEM monetdb DELETE NO\n"
"NULL tmp tmp_pk_uc _SYSTEM monetdb INSERT NO\n");
@@ -852,7 +852,7 @@ main(int argc, char **argv)
"Resultset with 8 columns\n"
"Resultset with 3 rows\n"
"TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME
GRANTOR GRANTEE PRIVILEGE IS_GRANTABLE\n"
- "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n"
+ "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(40) WVARCHAR(3)\n"
"NULL tmp tmp_pk_uc id1 _SYSTEM monetdb SELECT
NO\n"
"NULL tmp tmp_pk_uc name1 _SYSTEM monetdb SELECT
NO\n"
"NULL tmp tmp_pk_uc name1 _SYSTEM monetdb UPDATE
NO\n");
@@ -874,8 +874,8 @@ main(int argc, char **argv)
"Resultset with 8 columns\n"
"Resultset with 1 rows\n"
"SCOPE COLUMN_NAME DATA_TYPE TYPE_NAME
COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS PSEUDO_COLUMN\n"
- "SMALLINT WVARCHAR(1024) SMALLINT WCHAR(25)
INTEGER INTEGER SMALLINT SMALLINT\n"
- "1 id1 4 INTEGER 32 11 0 1\n");
+ "SMALLINT WVARCHAR(1024) SMALLINT WVARCHAR(25)
INTEGER INTEGER SMALLINT SMALLINT\n"
+ "1 id1 4 INTEGER 31 11 0 1\n");
ret = SQLStatistics(stmt, (SQLCHAR*)"", SQL_NTS,
(SQLCHAR*)"tmp", SQL_NTS, (SQLCHAR*)"glbl_pk_uc",
SQL_NTS,
@@ -907,7 +907,7 @@ main(int argc, char **argv)
"Resultset with 7 columns\n"
"Resultset with 2 rows\n"
"TABLE_CAT TABLE_SCHEM TABLE_NAME GRANTOR GRANTEE
PRIVILEGE IS_GRANTABLE\n"
- "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024)
WCHAR(1024) WVARCHAR(40) WCHAR(3)\n"
+ "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
WVARCHAR(1024) WVARCHAR(40) WVARCHAR(3)\n"
"NULL tmp glbl_pk_uc _SYSTEM monetdb DELETE NO\n"
"NULL tmp glbl_pk_uc _SYSTEM monetdb INSERT NO\n");
@@ -918,7 +918,7 @@ main(int argc, char **argv)
"Resultset with 8 columns\n"
"Resultset with 3 rows\n"
"TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME
GRANTOR GRANTEE PRIVILEGE IS_GRANTABLE\n"
- "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n"
+ "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(40) WVARCHAR(3)\n"
"NULL tmp glbl_pk_uc id1 _SYSTEM monetdb SELECT
NO\n"
"NULL tmp glbl_pk_uc name1 _SYSTEM monetdb SELECT
NO\n"
"NULL tmp glbl_pk_uc name1 _SYSTEM monetdb UPDATE
NO\n");
@@ -939,8 +939,8 @@ main(int argc, char **argv)
"Resultset with 8 columns\n"
"Resultset with 1 rows\n"
"SCOPE COLUMN_NAME DATA_TYPE TYPE_NAME
COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS PSEUDO_COLUMN\n"
- "SMALLINT WVARCHAR(1024) SMALLINT WCHAR(25)
INTEGER INTEGER SMALLINT SMALLINT\n"
- "1 id2 4 INTEGER 32 11 0 1\n");
+ "SMALLINT WVARCHAR(1024) SMALLINT WVARCHAR(25)
INTEGER INTEGER SMALLINT SMALLINT\n"
+ "1 id2 4 INTEGER 31 11 0 1\n");
ret = SQLStatistics(stmt, (SQLCHAR*)"", SQL_NTS,
(SQLCHAR*)"odbctst", SQL_NTS, (SQLCHAR*)"nopk_twoucs",
SQL_NTS,
@@ -972,7 +972,7 @@ main(int argc, char **argv)
"Resultset with 7 columns\n"
"Resultset with 0 rows\n"
"TABLE_CAT TABLE_SCHEM TABLE_NAME GRANTOR GRANTEE
PRIVILEGE IS_GRANTABLE\n"
- "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024)
WCHAR(1024) WVARCHAR(40) WCHAR(3)\n");
+ "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
WVARCHAR(1024) WVARCHAR(40) WVARCHAR(3)\n");
ret = SQLColumnPrivileges(stmt, (SQLCHAR*)"", SQL_NTS,
(SQLCHAR*)"odbctst", SQL_NTS, (SQLCHAR*)"nopk_twoucs",
SQL_NTS,
@@ -981,7 +981,7 @@ main(int argc, char **argv)
"Resultset with 8 columns\n"
"Resultset with 3 rows\n"
"TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME
GRANTOR GRANTEE PRIVILEGE IS_GRANTABLE\n"
- "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n"
+ "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(40) WVARCHAR(3)\n"
"NULL odbctst nopk_twoucs id2 _SYSTEM monetdb SELECT
NO\n"
"NULL odbctst nopk_twoucs name2 _SYSTEM monetdb SELECT
NO\n"
"NULL odbctst nopk_twoucs name2 _SYSTEM monetdb UPDATE
NO\n");
@@ -1002,8 +1002,8 @@ main(int argc, char **argv)
"Resultset with 8 columns\n"
"Resultset with 1 rows\n"
"SCOPE COLUMN_NAME DATA_TYPE TYPE_NAME
COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS PSEUDO_COLUMN\n"
- "SMALLINT WVARCHAR(1024) SMALLINT WCHAR(25)
INTEGER INTEGER SMALLINT SMALLINT\n"
- "1 id2 4 INTEGER 32 11 0 1\n");
+ "SMALLINT WVARCHAR(1024) SMALLINT WVARCHAR(25)
INTEGER INTEGER SMALLINT SMALLINT\n"
+ "1 id2 4 INTEGER 31 11 0 1\n");
ret = SQLStatistics(stmt, (SQLCHAR*)"", SQL_NTS,
(SQLCHAR*)"tmp", SQL_NTS, (SQLCHAR*)"tmp_nopk_twoucs",
SQL_NTS,
@@ -1035,7 +1035,7 @@ main(int argc, char **argv)
"Resultset with 7 columns\n"
"Resultset with 2 rows\n"
"TABLE_CAT TABLE_SCHEM TABLE_NAME GRANTOR GRANTEE
PRIVILEGE IS_GRANTABLE\n"
- "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024)
WCHAR(1024) WVARCHAR(40) WCHAR(3)\n"
+ "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
WVARCHAR(1024) WVARCHAR(40) WVARCHAR(3)\n"
"NULL tmp tmp_nopk_twoucs _SYSTEM monetdb DELETE NO\n"
"NULL tmp tmp_nopk_twoucs _SYSTEM monetdb INSERT NO\n");
@@ -1046,7 +1046,7 @@ main(int argc, char **argv)
"Resultset with 8 columns\n"
"Resultset with 3 rows\n"
"TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME
GRANTOR GRANTEE PRIVILEGE IS_GRANTABLE\n"
- "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n"
+ "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(40) WVARCHAR(3)\n"
"NULL tmp tmp_nopk_twoucs id2 _SYSTEM monetdb SELECT
NO\n"
"NULL tmp tmp_nopk_twoucs name2 _SYSTEM monetdb SELECT
NO\n"
"NULL tmp tmp_nopk_twoucs name2 _SYSTEM monetdb UPDATE
NO\n");
@@ -1067,8 +1067,8 @@ main(int argc, char **argv)
"Resultset with 8 columns\n"
"Resultset with 1 rows\n"
"SCOPE COLUMN_NAME DATA_TYPE TYPE_NAME
COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS PSEUDO_COLUMN\n"
- "SMALLINT WVARCHAR(1024) SMALLINT WCHAR(25)
INTEGER INTEGER SMALLINT SMALLINT\n"
- "1 id2 4 INTEGER 32 11 0 1\n");
+ "SMALLINT WVARCHAR(1024) SMALLINT WVARCHAR(25)
INTEGER INTEGER SMALLINT SMALLINT\n"
+ "1 id2 4 INTEGER 31 11 0 1\n");
ret = SQLStatistics(stmt, (SQLCHAR*)"", SQL_NTS,
(SQLCHAR*)"tmp", SQL_NTS, (SQLCHAR*)"glbl_nopk_twoucs",
SQL_NTS,
@@ -1100,7 +1100,7 @@ main(int argc, char **argv)
"Resultset with 7 columns\n"
"Resultset with 2 rows\n"
"TABLE_CAT TABLE_SCHEM TABLE_NAME GRANTOR GRANTEE
PRIVILEGE IS_GRANTABLE\n"
- "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024)
WCHAR(1024) WVARCHAR(40) WCHAR(3)\n"
+ "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
WVARCHAR(1024) WVARCHAR(40) WVARCHAR(3)\n"
"NULL tmp glbl_nopk_twoucs _SYSTEM monetdb DELETE
NO\n"
"NULL tmp glbl_nopk_twoucs _SYSTEM monetdb INSERT
NO\n");
@@ -1111,7 +1111,7 @@ main(int argc, char **argv)
"Resultset with 8 columns\n"
"Resultset with 3 rows\n"
"TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME
GRANTOR GRANTEE PRIVILEGE IS_GRANTABLE\n"
- "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n"
+ "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(40) WVARCHAR(3)\n"
"NULL tmp glbl_nopk_twoucs id2 _SYSTEM monetdb
SELECT NO\n"
"NULL tmp glbl_nopk_twoucs name2 _SYSTEM monetdb
SELECT NO\n"
"NULL tmp glbl_nopk_twoucs name2 _SYSTEM monetdb
UPDATE NO\n");
@@ -1124,15 +1124,15 @@ main(int argc, char **argv)
"Resultset with 8 columns\n"
"Resultset with 10 rows\n"
"SCOPE COLUMN_NAME DATA_TYPE TYPE_NAME
COLUMN_SIZE BUFFER_LENGTH DECIMAL_DIGITS PSEUDO_COLUMN\n"
- "SMALLINT WVARCHAR(1024) SMALLINT WCHAR(25)
INTEGER INTEGER SMALLINT SMALLINT\n"
+ "SMALLINT WVARCHAR(1024) SMALLINT WVARCHAR(25)
INTEGER INTEGER SMALLINT SMALLINT\n"
"1 schema -9 VARCHAR 1024 2048 NULL 1\n"
"1 table -9 VARCHAR 1024 2048 NULL 1\n"
"1 column -9 VARCHAR 1024 2048 NULL 1\n"
"1 type -9 VARCHAR 1024 2048 NULL 1\n"
- "1 typewidth 4 INTEGER 32 11 0
1\n"
- "1 count -5 BIGINT 64 20 0 1\n"
- "1 distinct -5 BIGINT 64 20 0
1\n"
- "1 atomwidth 4 INTEGER 32 11 0
1\n"
+ "1 typewidth 4 INTEGER 31 11 0
1\n"
+ "1 count -5 BIGINT 63 20 0 1\n"
+ "1 distinct -5 BIGINT 63 20 0
1\n"
+ "1 atomwidth 4 INTEGER 31 11 0
1\n"
"1 reference -7 BOOLEAN 1 1 NULL
1\n"
"1 isacolumn -7 BOOLEAN 1 1 NULL
1\n");
@@ -1220,7 +1220,7 @@ main(int argc, char **argv)
"Resultset with 7 columns\n"
"Resultset with 0 rows\n"
"TABLE_CAT TABLE_SCHEM TABLE_NAME GRANTOR GRANTEE
PRIVILEGE IS_GRANTABLE\n"
- "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WCHAR(1024)
WCHAR(1024) WVARCHAR(40) WCHAR(3)\n");
+ "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
WVARCHAR(1024) WVARCHAR(40) WVARCHAR(3)\n");
ret = SQLColumnPrivileges(stmt, (SQLCHAR*)"", SQL_NTS,
(SQLCHAR*)"odbctst", SQL_NTS, (SQLCHAR*)"pk_2c",
SQL_NTS,
@@ -1229,7 +1229,7 @@ main(int argc, char **argv)
"Resultset with 8 columns\n"
"Resultset with 0 rows\n"
"TABLE_CAT TABLE_SCHEM TABLE_NAME COLUMN_NAME
GRANTOR GRANTEE PRIVILEGE IS_GRANTABLE\n"
- "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
WCHAR(1024) WCHAR(1024) WVARCHAR(40) WCHAR(3)\n");
+ "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(1024)
WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(40) WVARCHAR(3)\n");
// test procedure sys.analyze(). There are 4 overloaded variants of
this procedure in MonetDB with 0, 1, 2 or 3 input parameters.
@@ -1252,7 +1252,7 @@ main(int argc, char **argv)
"Resultset with 20 columns\n"
"Resultset with 6 rows\n"
"PROCEDURE_CAT PROCEDURE_SCHEM PROCEDURE_NAME COLUMN_NAME
COLUMN_TYPE DATA_TYPE TYPE_NAME COLUMN_SIZE BUFFER_LENGTH
DECIMAL_DIGITS NUM_PREC_RADIX NULLABLE REMARKS COLUMN_DEF
SQL_DATA_TYPE SQL_DATETIME_SUB CHAR_OCTET_LENGTH
ORDINAL_POSITION IS_NULLABLE SPECIFIC_NAME\n"
- "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(256) WVARCHAR(256)
SMALLINT SMALLINT WCHAR(25) INTEGER INTEGER SMALLINT
SMALLINT SMALLINT WVARCHAR(65000) WVARCHAR(1) SMALLINT
SMALLINT INTEGER INTEGER WCHAR WVARCHAR(10)\n"
+ "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(256) WVARCHAR(256)
SMALLINT SMALLINT WVARCHAR(25) INTEGER INTEGER SMALLINT
SMALLINT SMALLINT WVARCHAR(65000) WVARCHAR(1) SMALLINT
SMALLINT INTEGER INTEGER WVARCHAR WVARCHAR(10)\n"
"NULL sys analyze sname 1 -9 VARCHAR 1024
2048 NULL NULL 2 NULL NULL -9 NULL 4096 1
replacedId\n"
"NULL sys analyze sname 1 -9 VARCHAR 1024
2048 NULL NULL 2 NULL NULL -9 NULL 4096 1
replacedId\n"
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
