Changeset: 35e7ed99f72e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=35e7ed99f72e Modified Files: clients/Tests/SQL-dump.SQL.py clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/check.SQL.py sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/check.SQL.py sql/test/emptydb-upgrade-chain/Tests/check.stable.out sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/check.SQL.py sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade/Tests/check.SQL.py sql/test/emptydb-upgrade/Tests/check.stable.out sql/test/emptydb-upgrade/Tests/check.stable.out.int128 sql/test/emptydb/Tests/check.SQL.py sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.int128 Branch: Jun2016 Log Message:
Merge with Jul2015 branch. diffs (truncated from 1816 to 300 lines): diff --git a/clients/Tests/SQL-dump.SQL.py b/clients/Tests/SQL-dump.SQL.py --- a/clients/Tests/SQL-dump.SQL.py +++ b/clients/Tests/SQL-dump.SQL.py @@ -107,6 +107,12 @@ select t.name, g.name, g.time, g.orienta select s.name, t.systemname, t.sqlname, t.digits, t.scale, t.radix, t.eclass from sys.types t left outer join sys.schemas s on s.id = t.schema_id order by s.name, t.systemname, t.sqlname, t.digits, t.scale, t.radix, t.eclass; -- user_role select a1.name, a2.name from sys.auths a1, sys.auths a2, sys.user_role ur where a1.id = ur.login_id and a2.id = ur.role_id order by a1.name, a2.name; +-- keywords +select keyword from sys.keywords order by keyword; +-- table_types +select table_type_id, table_type_name from sys.table_types order by table_type_id, table_type_name; +-- dependency_types +select dependency_type_id, dependency_type_name from sys.dependency_types order by dependency_type_id, dependency_type_name; ''' sys.stdout.write(out) diff --git a/clients/Tests/SQL-dump.stable.out b/clients/Tests/SQL-dump.stable.out --- a/clients/Tests/SQL-dump.stable.out +++ b/clients/Tests/SQL-dump.stable.out @@ -1269,6 +1269,12 @@ select t.name, g.name, g.time, g.orienta select s.name, t.systemname, t.sqlname, t.digits, t.scale, t.radix, t.eclass from sys.types t left outer join sys.schemas s on s.id = t.schema_id order by s.name, t.systemname, t.sqlname, t.digits, t.scale, t.radix, t.eclass; -- user_role select a1.name, a2.name from sys.auths a1, sys.auths a2, sys.user_role ur where a1.id = ur.login_id and a2.id = ur.role_id order by a1.name, a2.name; +-- keywords +select keyword from sys.keywords order by keyword; +-- table_types +select table_type_id, table_type_name from sys.table_types order by table_type_id, table_type_name; +-- dependency_types +select dependency_type_id, dependency_type_name from sys.dependency_types order by dependency_type_id, dependency_type_name; #select name, authorization, owner, system from sys.schemas order by name; % sys.schemas, sys.schemas, sys.schemas, sys.schemas # table_name % name, authorization, owner, system # name @@ -9803,6 +9809,155 @@ select a1.name, a2.name from sys.auths a % name, name # name % varchar, varchar # type % 0, 0 # length +#select keyword from sys.keywords order by keyword; +% sys.keywords # table_name +% keyword # name +% varchar # type +% 14 # length +[ "ADMIN" ] +[ "AFTER" ] +[ "AGGREGATE" ] +[ "ALWAYS" ] +[ "ASYMMETRIC" ] +[ "ATOMIC" ] +[ "AUTO_INCREMENT" ] +[ "BEFORE" ] +[ "BIGINT" ] +[ "BIGSERIAL" ] +[ "BINARY" ] +[ "BLOB" ] +[ "CALL" ] +[ "CHAIN" ] +[ "CLOB" ] +[ "COMMITTED" ] +[ "COPY" ] +[ "CORR" ] +[ "CUME_DIST" ] +[ "CURRENT_ROLE" ] +[ "CYCLE" ] +[ "DATABASE" ] +[ "DELIMITERS" ] +[ "DENSE_RANK" ] +[ "DO" ] +[ "EACH" ] +[ "ELSEIF" ] +[ "ENCRYPTED" ] +[ "EVERY" ] +[ "EXCLUDE" ] +[ "FOLLOWING" ] +[ "FUNCTION" ] +[ "GENERATED" ] +[ "IF" ] +[ "ILIKE" ] +[ "INCREMENT" ] +[ "LAG" ] +[ "LEAD" ] +[ "LIMIT" ] +[ "LOCALTIME" ] +[ "LOCALTIMESTAMP" ] +[ "LOCKED" ] +[ "MAXVALUE" ] +[ "MEDIAN" ] +[ "MEDIUMINT" ] +[ "MERGE" ] +[ "MINVALUE" ] +[ "NEW" ] +[ "NOCYCLE" ] +[ "NOMAXVALUE" ] +[ "NOMINVALUE" ] +[ "NOW" ] +[ "OFFSET" ] +[ "OLD" ] +[ "OTHERS" ] +[ "OVER" ] +[ "PARTITION" ] +[ "PERCENT_RANK" ] +[ "PLAN" ] +[ "PRECEDING" ] +[ "PROD" ] +[ "QUANTILE" ] +[ "RANGE" ] +[ "RANK" ] +[ "RECORDS" ] +[ "REFERENCING" ] +[ "REMOTE" ] +[ "RENAME" ] +[ "REPEATABLE" ] +[ "REPLICA" ] +[ "RESTART" ] +[ "RETURN" ] +[ "RETURNS" ] +[ "ROWS" ] +[ "ROW_NUMBER" ] +[ "SAMPLE" ] +[ "SAVEPOINT" ] +[ "SCHEMA" ] +[ "SEQUENCE" ] +[ "SERIAL" ] +[ "SERIALIZABLE" ] +[ "SIMPLE" ] +[ "START" ] +[ "STATEMENT" ] +[ "STDIN" ] +[ "STDOUT" ] +[ "STREAM" ] +[ "STRING" ] +[ "SYMMETRIC" ] +[ "TIES" ] +[ "TINYINT" ] +[ "TRIGGER" ] +[ "UNBOUNDED" ] +[ "UNCOMMITTED" ] +[ "UNENCRYPTED" ] +[ "WHILE" ] +[ "XMLAGG" ] +[ "XMLATTRIBUTES" ] +[ "XMLCOMMENT" ] +[ "XMLCONCAT" ] +[ "XMLDOCUMENT" ] +[ "XMLELEMENT" ] +[ "XMLFOREST" ] +[ "XMLNAMESPACES" ] +[ "XMLPARSE" ] +[ "XMLPI" ] +[ "XMLQUERY" ] +[ "XMLSCHEMA" ] +[ "XMLTEXT" ] +[ "XMLVALIDATE" ] +#select table_type_id, table_type_name from sys.table_types order by table_type_id, table_type_name; +% sys.table_types, sys.table_types # table_name +% table_type_id, table_type_name # name +% smallint, varchar # type +% 2, 22 # length +[ 0, "TABLE" ] +[ 1, "VIEW" ] +[ 3, "MERGE TABLE" ] +[ 4, "STREAM TABLE" ] +[ 5, "REMOTE TABLE" ] +[ 6, "REPLICA TABLE" ] +[ 10, "SYSTEM TABLE" ] +[ 11, "SYSTEM VIEW" ] +[ 20, "GLOBAL TEMPORARY TABLE" ] +[ 30, "LOCAL TEMPORARY TABLE" ] +#select dependency_type_id, dependency_type_name from sys.dependency_types order by dependency_type_id, dependency_type_name; +% sys.dependency_types, sys.dependency_types # table_name +% dependency_type_id, dependency_type_name # name +% smallint, varchar # type +% 2, 10 # length +[ 1, "SCHEMA" ] +[ 2, "TABLE" ] +[ 3, "COLUMN" ] +[ 4, "KEY" ] +[ 5, "VIEW" ] +[ 6, "USER" ] +[ 7, "FUNCTION" ] +[ 8, "TRIGGER" ] +[ 9, "OWNER" ] +[ 10, "INDEX" ] +[ 11, "FKEY" ] +[ 12, "SEQUENCE" ] +[ 13, "PROCEDURE" ] +[ 14, "BE_DROPPED" ] # 13:32:07 > # 13:32:07 > "Done." diff --git a/clients/Tests/SQL-dump.stable.out.int128 b/clients/Tests/SQL-dump.stable.out.int128 --- a/clients/Tests/SQL-dump.stable.out.int128 +++ b/clients/Tests/SQL-dump.stable.out.int128 @@ -1279,6 +1279,12 @@ select t.name, g.name, g.time, g.orienta select s.name, t.systemname, t.sqlname, t.digits, t.scale, t.radix, t.eclass from sys.types t left outer join sys.schemas s on s.id = t.schema_id order by s.name, t.systemname, t.sqlname, t.digits, t.scale, t.radix, t.eclass; -- user_role select a1.name, a2.name from sys.auths a1, sys.auths a2, sys.user_role ur where a1.id = ur.login_id and a2.id = ur.role_id order by a1.name, a2.name; +-- keywords +select keyword from sys.keywords order by keyword; +-- table_types +select table_type_id, table_type_name from sys.table_types order by table_type_id, table_type_name; +-- dependency_types +select dependency_type_id, dependency_type_name from sys.dependency_types order by dependency_type_id, dependency_type_name; #select name, authorization, owner, system from sys.schemas order by name; % sys.schemas, sys.schemas, sys.schemas, sys.schemas # table_name % name, authorization, owner, system # name @@ -10739,6 +10745,155 @@ select a1.name, a2.name from sys.auths a % name, name # name % varchar, varchar # type % 0, 0 # length +#select keyword from sys.keywords order by keyword; +% sys.keywords # table_name +% keyword # name +% varchar # type +% 14 # length +[ "ADMIN" ] +[ "AFTER" ] +[ "AGGREGATE" ] +[ "ALWAYS" ] +[ "ASYMMETRIC" ] +[ "ATOMIC" ] +[ "AUTO_INCREMENT" ] +[ "BEFORE" ] +[ "BIGINT" ] +[ "BIGSERIAL" ] +[ "BINARY" ] +[ "BLOB" ] +[ "CALL" ] +[ "CHAIN" ] +[ "CLOB" ] +[ "COMMITTED" ] +[ "COPY" ] +[ "CORR" ] +[ "CUME_DIST" ] +[ "CURRENT_ROLE" ] +[ "CYCLE" ] +[ "DATABASE" ] +[ "DELIMITERS" ] +[ "DENSE_RANK" ] +[ "DO" ] +[ "EACH" ] +[ "ELSEIF" ] +[ "ENCRYPTED" ] +[ "EVERY" ] +[ "EXCLUDE" ] +[ "FOLLOWING" ] +[ "FUNCTION" ] +[ "GENERATED" ] +[ "IF" ] +[ "ILIKE" ] +[ "INCREMENT" ] +[ "LAG" ] +[ "LEAD" ] +[ "LIMIT" ] +[ "LOCALTIME" ] +[ "LOCALTIMESTAMP" ] +[ "LOCKED" ] +[ "MAXVALUE" ] +[ "MEDIAN" ] +[ "MEDIUMINT" ] +[ "MERGE" ] +[ "MINVALUE" ] +[ "NEW" ] +[ "NOCYCLE" ] +[ "NOMAXVALUE" ] +[ "NOMINVALUE" ] +[ "NOW" ] +[ "OFFSET" ] +[ "OLD" ] +[ "OTHERS" ] +[ "OVER" ] +[ "PARTITION" ] +[ "PERCENT_RANK" ] +[ "PLAN" ] +[ "PRECEDING" ] +[ "PROD" ] +[ "QUANTILE" ] +[ "RANGE" ] +[ "RANK" ] +[ "RECORDS" ] +[ "REFERENCING" ] +[ "REMOTE" ] +[ "RENAME" ] +[ "REPEATABLE" ] +[ "REPLICA" ] +[ "RESTART" ] +[ "RETURN" ] +[ "RETURNS" ] +[ "ROWS" ] +[ "ROW_NUMBER" ] +[ "SAMPLE" ] +[ "SAVEPOINT" ] +[ "SCHEMA" ] +[ "SEQUENCE" ] +[ "SERIAL" ] +[ "SERIALIZABLE" ] +[ "SIMPLE" ] +[ "START" ] +[ "STATEMENT" ] +[ "STDIN" ] +[ "STDOUT" ] +[ "STREAM" ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
