Changeset: c897ecb86b67 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c897ecb86b67
Modified Files:
        clients/odbc/tests/ODBCmetadata.c
        clients/odbc/tests/ODBCtester.c
        clients/ruby/Tests/gemtest.rb
        sql/backends/monet5/sql_upgrades.c
        sql/benchmarks/tpcds/Tests/one.test.in
        sql/scripts/52_describe.sql
        
sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.test
        sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.test
        
sql/test/BugTracker-2017/Tests/crash_after_oidx_on_sys_statistics.Bug-6251.test
        
sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.test
        
sql/test/BugTracker-2021/Tests/WITH-alias-DELETE-2.deletes-too-many-tuples.Bug-7133.test
        sql/test/BugTracker-2023/Tests/greatest-least-multi-arg-7391.test
        sql/test/BugTracker-2023/Tests/join-on-row_number-over-7403.test
        sql/test/BugTracker-2023/Tests/misc-crashes-7390.test
        sql/test/Dependencies/Tests/dependency_DBobjects.test
        sql/test/Dependencies/Tests/dependency_functions.test
        sql/test/Dependencies/Tests/dependency_owner_schema_3.test
        sql/test/Dump/Tests/dump-again.stable.out
        sql/test/Dump/Tests/dump.stable.out
        
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-query.test
        
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.test
        
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.test
        
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.test
        
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.test
        sql/test/SQLancer/Tests/sqlancer10.test
        sql/test/Tests/keys.test
        sql/test/Tests/select_window_pushdown.test
        sql/test/astro/Tests/astro.test
        sql/test/copy/Tests/nonutf8.test
        
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
        sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
        sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
        sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
        sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
        sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
        sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade/Tests/upgrade.stable.out
        sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
        sql/test/emptydb/Tests/check.SQL.py
        sql/test/emptydb/Tests/check.stable.out
        sql/test/emptydb/Tests/check.stable.out.32bit
        sql/test/emptydb/Tests/check.stable.out.int128
        sql/test/file_loader/Tests/file_loader_function.test
        sql/test/information-schema/Tests/columns.test
        sql/test/miscellaneous/Tests/deallocate.stable.out
        sql/test/miscellaneous/Tests/groupby_prepare.stable.out
        sql/test/miscellaneous/Tests/prepare.test
        sql/test/miscellaneous/Tests/rel_push_count_down.test
        sql/test/miscellaneous/Tests/select_groupby.stable.out
        sql/test/miscellaneous/Tests/simple_plans.test
        sql/test/miscellaneous/Tests/unique_keys.test
        sql/test/pg_regress/Tests/int8.test
        sql/test/prepare/Tests/named_placeholders.test
        sql/test/prepare/Tests/prepare-insert-into.stable.out
        sql/test/prepare/Tests/prepare-types.Bug-6724.stable.out
        sql/test/prepare/Tests/prepare_commit_execute.SF-2606020.stable.out
        sql/test/prepare/Tests/prepare_doesnot_like_LIKE.SF-1234205.stable.out
        sql/test/prepare/Tests/prepare_unop_crash.Bug-3653.stable.out
        sql/test/prepare/Tests/prepared-merge-statement.Bug-6706.stable.out
        sql/test/prepare/Tests/prepared-statement-with-udf.Bug-6650.stable.out
        sql/test/prepare/Tests/sqlancer_prepare.stable.out.int128
        sql/test/sql_dump/Tests/dump.test
        sql/test/sql_xml/Tests/cleanupfuncs.test
        sql/test/strimps/Tests/strimps_stable_counts2.test
        sql/test/sys-schema/Tests/webExamplesComparisonFunctionsOperators.test
        
sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
        sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
        sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
        sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
        sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
        sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
        sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
        sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
        sql/test/testdb-upgrade/Tests/upgrade.stable.out
        sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
        sql/test/testdb/Tests/dump-nogeom.stable.out
        sql/test/testdb/Tests/dump.stable.out
        testing/sqllogictest.py
Branch: cleanup_types
Log Message:

Implemented upgrade + approved changes.


diffs (truncated from 18881 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,7 +608,7 @@ 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"
+               "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 31      11      
0       2       0       NULL    NULL    4       NULL    NULL    1       NO\n"
@@ -625,7 +625,7 @@ 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"
+               "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 31      
11      0       2       0       NULL    NULL    4       NULL    NULL    1       
NO\n"
@@ -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,7 +675,7 @@ 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"
+               "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,
@@ -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,7 +734,7 @@ 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"
+               "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,
@@ -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,7 +808,7 @@ 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"
+               "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,
@@ -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,7 +874,7 @@ 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"
+               "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,
@@ -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,7 +939,7 @@ 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"
+               "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,
@@ -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,7 +1002,7 @@ 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"
+               "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,
@@ -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,7 +1067,7 @@ 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"
+               "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,
@@ -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,7 +1124,7 @@ 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"
@@ -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"
                "NULL   sys     analyze tname   1       -9      VARCHAR 1024    
2048    NULL    NULL    2       NULL    NULL    -9      NULL    4096    2       
        replacedId\n"
@@ -1278,7 +1278,7 @@ main(int argc, char **argv)
                "Resultset with 20 columns\n"
                "Resultset with 4 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     sin     arg_1   1       7       REAL    24      
14      7       2       2       NULL    NULL    7       NULL    NULL    1       
        replacedId\n"
                "NULL   sys     sin     res_0   5       7       REAL    24      
14      7       2       2       NULL    NULL    7       NULL    NULL    0       
        replacedId\n"
                "NULL   sys     sin     arg_1   1       8       DOUBLE  53      
24      15      2       2       NULL    NULL    8       NULL    NULL    1       
        replacedId\n"
@@ -1301,7 +1301,7 @@ main(int argc, char **argv)
                "Resultset with 20 columns\n"
                "Resultset with 2 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     env     name    3       -9      VARCHAR 1024    
2048    NULL    NULL    2       NULL    NULL    -9      NULL    4096    1       
        replacedId\n"
                "NULL   sys     env     value   3       -9      VARCHAR 2048    
4096    NULL    NULL    2       NULL    NULL    -9      NULL    8192    2       
        replacedId\n");
 
@@ -1325,7 +1325,7 @@ main(int argc, char **argv)
                "Resultset with 20 columns\n"
                "Resultset with 58 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"
                // 0 input argument and 13 result columns of sys.statistics()
                "NULL   sys     statistics      column_id       3       4       
INTEGER 31      11      0       2       2       NULL    NULL    4       NULL    
NULL    1               replacedId\n"
                "NULL   sys     statistics      schema  3       -9      VARCHAR 
1024    2048    NULL    NULL    2       NULL    NULL    -9      NULL    4096    
2               replacedId\n"
@@ -1336,8 +1336,8 @@ main(int argc, char **argv)
                "NULL   sys     statistics      count   3       -5      BIGINT  
63      20      0       2       2       NULL    NULL    -5      NULL    NULL    
7               replacedId\n"
                "NULL   sys     statistics      unique  3       -7      BOOLEAN 
1       1       NULL    NULL    2       NULL    NULL    -7      NULL    NULL    
8               replacedId\n"
                "NULL   sys     statistics      nils    3       -7      BOOLEAN 
1       1       NULL    NULL    2       NULL    NULL    -7      NULL    NULL    
9               replacedId\n"
-               "NULL   sys     statistics      minval  3       -10     
CHARACTER LARGE OBJECT  0       0       NULL    NULL    2       NULL    NULL    
-10     NULL    0       10              replacedId\n"
-               "NULL   sys     statistics      maxval  3       -10     
CHARACTER LARGE OBJECT  0       0       NULL    NULL    2       NULL    NULL    
-10     NULL    0       11              replacedId\n"
+               "NULL   sys     statistics      minval  3       -9      VARCHAR 
0       0       NULL    NULL    2       NULL    NULL    -9      NULL    0       
10              replacedId\n"
+               "NULL   sys     statistics      maxval  3       -9      VARCHAR 
0       0       NULL    NULL    2       NULL    NULL    -9      NULL    0       
11              replacedId\n"
                "NULL   sys     statistics      sorted  3       -7      BOOLEAN 
1       1       NULL    NULL    2       NULL    NULL    -7      NULL    NULL    
12              replacedId\n"
                "NULL   sys     statistics      revsorted       3       -7      
BOOLEAN 1       1       NULL    NULL    2       NULL    NULL    -7      NULL    
NULL    13              replacedId\n"
 
@@ -1352,8 +1352,8 @@ main(int argc, char **argv)
                "NULL   sys     statistics      count   3       -5      BIGINT  
63      20      0       2       2       NULL    NULL    -5      NULL    NULL    
7               replacedId\n"
                "NULL   sys     statistics      unique  3       -7      BOOLEAN 
1       1       NULL    NULL    2       NULL    NULL    -7      NULL    NULL    
8               replacedId\n"
                "NULL   sys     statistics      nils    3       -7      BOOLEAN 
1       1       NULL    NULL    2       NULL    NULL    -7      NULL    NULL    
9               replacedId\n"
-               "NULL   sys     statistics      minval  3       -10     
CHARACTER LARGE OBJECT  0       0       NULL    NULL    2       NULL    NULL    
-10     NULL    0       10              replacedId\n"
-               "NULL   sys     statistics      maxval  3       -10     
CHARACTER LARGE OBJECT  0       0       NULL    NULL    2       NULL    NULL    
-10     NULL    0       11              replacedId\n"
+               "NULL   sys     statistics      minval  3       -9      VARCHAR 
0       0       NULL    NULL    2       NULL    NULL    -9      NULL    0       
10              replacedId\n"
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

Reply via email to