Changeset: 84d26fddf423 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=84d26fddf423 Modified Files: sql/test/BugTracker-2016/Tests/storagemodel.stable.out sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.sql sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.stable.out Branch: default Log Message:
Test fixes and approvals. diffs (256 lines): diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out --- a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out +++ b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out @@ -74,7 +74,7 @@ Ready. [ "sys", "_tables", "id", "int", "writable", 4, 0, false, 0 ] [ "sys", "_tables", "name", "varchar", "writable", 9, 0, false, 0 ] [ "sys", "_tables", "schema_id", "int", "writable", 4, 0, false, 0 ] -[ "sys", "_tables", "query", "varchar", "writable", 55, 0, false, 0 ] +[ "sys", "_tables", "query", "varchar", "writable", 75, 0, false, 0 ] [ "sys", "_tables", "type", "smallint", "writable", 2, 0, false, 0 ] [ "sys", "_tables", "system", "boolean", "writable", 1, 0, false, 0 ] [ "sys", "_tables", "commit_action", "smallint", "writable", 2, 0, false, 0 ] @@ -99,7 +99,7 @@ Ready. [ "sys", "_tables", "id", "int", "writable", 4, 0, false, 0 ] [ "sys", "_tables", "name", "varchar", "writable", 9, 0, false, 0 ] [ "sys", "_tables", "schema_id", "int", "writable", 4, 0, false, 0 ] -[ "sys", "_tables", "query", "varchar", "writable", 55, 0, false, 0 ] +[ "sys", "_tables", "query", "varchar", "writable", 74, 0, false, 0 ] [ "sys", "_tables", "type", "smallint", "writable", 2, 0, false, 0 ] [ "sys", "_tables", "system", "boolean", "writable", 1, 0, false, 0 ] [ "sys", "_tables", "commit_action", "smallint", "writable", 2, 0, false, 0 ] diff --git a/sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.sql b/sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.sql --- a/sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.sql +++ b/sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.sql @@ -1,3 +1,65 @@ +START TRANSACTION; +CREATE TABLE sys.objcts ( + "id" INTEGER, + "name" VARCHAR(1024), + "nr" INTEGER +); +COPY 54 RECORDS INTO sys.objcts FROM stdin USING DELIMITERS '\t','\n','"'; +6965 "srid" 0 +6964 "srid" 0 +7676 "keyword" 0 +7675 "keyword" 0 +7681 "table_type_id" 0 +7684 "table_type_name" 0 +7680 "table_type_id" 0 +7683 "table_type_name" 0 +7689 "dependency_type_id" 0 +7692 "dependency_type_name" 0 +7688 "dependency_type_id" 0 +7691 "dependency_type_name" 0 +7697 "function_type_id" 0 +7700 "function_type_name" 0 +7696 "function_type_id" 0 +7699 "function_type_name" 0 +7709 "language_id" 0 +7712 "language_name" 0 +7708 "language_id" 0 +7711 "language_name" 0 +7717 "key_type_id" 0 +7720 "key_type_name" 0 +7716 "key_type_id" 0 +7719 "key_type_name" 0 +7725 "index_type_id" 0 +7728 "index_type_name" 0 +7724 "index_type_id" 0 +7727 "index_type_name" 0 +7733 "privilege_code_id" 0 +7736 "privilege_code_name" 0 +7732 "privilege_code_id" 0 +7735 "privilege_code_name" 0 +8159 "file_id" 0 +8158 "file_id" 0 +8170 "sn" 0 +8170 "file_id" 1 +8172 "file_id" 0 +8169 "sn" 0 +8169 "file_id" 1 +8171 "file_id" 0 +8189 "id" 0 +8189 "file_id" 1 +8191 "file_id" 0 +8188 "id" 0 +8188 "file_id" 1 +8190 "file_id" 0 +8201 "id" 0 +8201 "file_id" 1 +8203 "file_id" 0 +8200 "id" 0 +8200 "file_id" 1 +8202 "file_id" 0 +8300 "id" 0 +8299 "id" 0 + select sample_2.name as c0, sample_2.id as c1, @@ -8,7 +70,8 @@ select 11 as c5, sample_2.id as c6 from - sys.objects as sample_2 + sys.objcts as sample_2 where sample_2.name is not NULL limit 61; +ROLLBACK; diff --git a/sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.stable.out b/sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.stable.out --- a/sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.stable.out +++ b/sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.stable.out @@ -24,6 +24,33 @@ Ready. # 13:47:14 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-7389" "--port=39137" # 13:47:14 > +#START TRANSACTION; +#CREATE TABLE sys.objcts ( +# "id" INTEGER, +# "name" VARCHAR(1024), +# "nr" INTEGER +#); +#COPY 54 RECORDS INTO sys.objcts FROM stdin USING DELIMITERS '\t','\n','"'; +#6965 "srid" 0 +#6964 "srid" 0 +#7676 "keyword" 0 +#7675 "keyword" 0 +#7681 "table_type_id" 0 +#7684 "table_type_name" 0 +#7680 "table_type_id" 0 +#7683 "table_type_name" 0 +#7689 "dependency_type_id" 0 +#7692 "dependency_type_name" 0 +#7688 "dependency_type_id" 0 +#7691 "dependency_type_name" 0 +#7697 "function_type_id" 0 +#7700 "function_type_name" 0 +#7696 "function_type_id" 0 +#7699 "function_type_name" 0 +#7709 "language_id" 0 +#7712 "language_name" 0 +#7708 "language_id" 0 +[ 54 ] #select # sample_2.name as c0, # sample_2.id as c1, @@ -43,65 +70,59 @@ Ready. % 20, 4, 20, 4, 4, 2, 4 # length [ "srid", 6965, "srid", 6965, 6965, 11, 6965 ] [ "srid", 6964, "srid", 6964, 6964, 11, 6964 ] -[ "keyword", 7674, "keyword", 7674, 7674, 11, 7674 ] -[ "keyword", 7673, "keyword", 7673, 7673, 11, 7673 ] -[ "table_type_id", 7679, "table_type_id", 7679, 7679, 11, 7679 ] -[ "table_type_name", 7682, "table_type_name", 7682, 7682, 11, 7682 ] -[ "table_type_id", 7678, "table_type_id", 7678, 7678, 11, 7678 ] -[ "table_type_name", 7681, "table_type_name", 7681, 7681, 11, 7681 ] -[ "dependency_type_id", 7687, "dependency_type_id", 7687, 7687, 11, 7687 ] -[ "dependency_type_name", 7690, "dependency_type_name", 7690, 7690, 11, 7690 ] -[ "dependency_type_id", 7686, "dependency_type_id", 7686, 7686, 11, 7686 ] -[ "dependency_type_name", 7689, "dependency_type_name", 7689, 7689, 11, 7689 ] -[ "function_type_id", 7695, "function_type_id", 7695, 7695, 11, 7695 ] -[ "function_type_name", 7698, "function_type_name", 7698, 7698, 11, 7698 ] -[ "function_type_id", 7694, "function_type_id", 7694, 7694, 11, 7694 ] -[ "function_type_name", 7697, "function_type_name", 7697, 7697, 11, 7697 ] -[ "language_id", 7703, "language_id", 7703, 7703, 11, 7703 ] -[ "language_name", 7706, "language_name", 7706, 7706, 11, 7706 ] -[ "language_id", 7702, "language_id", 7702, 7702, 11, 7702 ] -[ "language_name", 7705, "language_name", 7705, 7705, 11, 7705 ] -[ "key_type_id", 7711, "key_type_id", 7711, 7711, 11, 7711 ] -[ "key_type_name", 7714, "key_type_name", 7714, 7714, 11, 7714 ] -[ "key_type_id", 7710, "key_type_id", 7710, 7710, 11, 7710 ] -[ "key_type_name", 7713, "key_type_name", 7713, 7713, 11, 7713 ] -[ "index_type_id", 7719, "index_type_id", 7719, 7719, 11, 7719 ] -[ "index_type_name", 7722, "index_type_name", 7722, 7722, 11, 7722 ] -[ "index_type_id", 7718, "index_type_id", 7718, 7718, 11, 7718 ] -[ "index_type_name", 7721, "index_type_name", 7721, 7721, 11, 7721 ] -[ "privilege_code_id", 7727, "privilege_code_id", 7727, 7727, 11, 7727 ] -[ "privilege_code_name", 7730, "privilege_code_name", 7730, 7730, 11, 7730 ] -[ "privilege_code_id", 7726, "privilege_code_id", 7726, 7726, 11, 7726 ] -[ "privilege_code_name", 7729, "privilege_code_name", 7729, 7729, 11, 7729 ] -[ "file_id", 8153, "file_id", 8153, 8153, 11, 8153 ] -[ "file_id", 8152, "file_id", 8152, 8152, 11, 8152 ] -[ "sn", 8164, "sn", 8164, 8164, 11, 8164 ] -[ "file_id", 8164, "file_id", 8164, 8164, 11, 8164 ] -[ "file_id", 8166, "file_id", 8166, 8166, 11, 8166 ] -[ "sn", 8163, "sn", 8163, 8163, 11, 8163 ] -[ "file_id", 8163, "file_id", 8163, 8163, 11, 8163 ] -[ "file_id", 8165, "file_id", 8165, 8165, 11, 8165 ] -[ "id", 8183, "id", 8183, 8183, 11, 8183 ] -[ "file_id", 8183, "file_id", 8183, 8183, 11, 8183 ] -[ "file_id", 8185, "file_id", 8185, 8185, 11, 8185 ] -[ "id", 8182, "id", 8182, 8182, 11, 8182 ] -[ "file_id", 8182, "file_id", 8182, 8182, 11, 8182 ] -[ "file_id", 8184, "file_id", 8184, 8184, 11, 8184 ] -[ "id", 8195, "id", 8195, 8195, 11, 8195 ] -[ "file_id", 8195, "file_id", 8195, 8195, 11, 8195 ] -[ "file_id", 8197, "file_id", 8197, 8197, 11, 8197 ] -[ "id", 8194, "id", 8194, 8194, 11, 8194 ] -[ "file_id", 8194, "file_id", 8194, 8194, 11, 8194 ] -[ "file_id", 8196, "file_id", 8196, 8196, 11, 8196 ] -[ "id", 8294, "id", 8294, 8294, 11, 8294 ] -[ "id", 8293, "id", 8293, 8293, 11, 8293 ] -[ "width", 8832, "width", 8832, 8832, 11, 8832 ] -[ "p_partkey", 8939, "p_partkey", 8939, 8939, 11, 8939 ] -[ "p_partkey", 8938, "p_partkey", 8938, 8938, 11, 8938 ] -[ "ps_partkey", 8948, "ps_partkey", 8948, 8948, 11, 8948 ] -[ "ps_suppkey", 8948, "ps_suppkey", 8948, 8948, 11, 8948 ] -[ "ps_partkey", 8950, "ps_partkey", 8950, 8950, 11, 8950 ] -[ "ps_partkey", 8947, "ps_partkey", 8947, 8947, 11, 8947 ] +[ "keyword", 7676, "keyword", 7676, 7676, 11, 7676 ] +[ "keyword", 7675, "keyword", 7675, 7675, 11, 7675 ] +[ "table_type_id", 7681, "table_type_id", 7681, 7681, 11, 7681 ] +[ "table_type_name", 7684, "table_type_name", 7684, 7684, 11, 7684 ] +[ "table_type_id", 7680, "table_type_id", 7680, 7680, 11, 7680 ] +[ "table_type_name", 7683, "table_type_name", 7683, 7683, 11, 7683 ] +[ "dependency_type_id", 7689, "dependency_type_id", 7689, 7689, 11, 7689 ] +[ "dependency_type_name", 7692, "dependency_type_name", 7692, 7692, 11, 7692 ] +[ "dependency_type_id", 7688, "dependency_type_id", 7688, 7688, 11, 7688 ] +[ "dependency_type_name", 7691, "dependency_type_name", 7691, 7691, 11, 7691 ] +[ "function_type_id", 7697, "function_type_id", 7697, 7697, 11, 7697 ] +[ "function_type_name", 7700, "function_type_name", 7700, 7700, 11, 7700 ] +[ "function_type_id", 7696, "function_type_id", 7696, 7696, 11, 7696 ] +[ "function_type_name", 7699, "function_type_name", 7699, 7699, 11, 7699 ] +[ "language_id", 7709, "language_id", 7709, 7709, 11, 7709 ] +[ "language_name", 7712, "language_name", 7712, 7712, 11, 7712 ] +[ "language_id", 7708, "language_id", 7708, 7708, 11, 7708 ] +[ "language_name", 7711, "language_name", 7711, 7711, 11, 7711 ] +[ "key_type_id", 7717, "key_type_id", 7717, 7717, 11, 7717 ] +[ "key_type_name", 7720, "key_type_name", 7720, 7720, 11, 7720 ] +[ "key_type_id", 7716, "key_type_id", 7716, 7716, 11, 7716 ] +[ "key_type_name", 7719, "key_type_name", 7719, 7719, 11, 7719 ] +[ "index_type_id", 7725, "index_type_id", 7725, 7725, 11, 7725 ] +[ "index_type_name", 7728, "index_type_name", 7728, 7728, 11, 7728 ] +[ "index_type_id", 7724, "index_type_id", 7724, 7724, 11, 7724 ] +[ "index_type_name", 7727, "index_type_name", 7727, 7727, 11, 7727 ] +[ "privilege_code_id", 7733, "privilege_code_id", 7733, 7733, 11, 7733 ] +[ "privilege_code_name", 7736, "privilege_code_name", 7736, 7736, 11, 7736 ] +[ "privilege_code_id", 7732, "privilege_code_id", 7732, 7732, 11, 7732 ] +[ "privilege_code_name", 7735, "privilege_code_name", 7735, 7735, 11, 7735 ] +[ "file_id", 8159, "file_id", 8159, 8159, 11, 8159 ] +[ "file_id", 8158, "file_id", 8158, 8158, 11, 8158 ] +[ "sn", 8170, "sn", 8170, 8170, 11, 8170 ] +[ "file_id", 8170, "file_id", 8170, 8170, 11, 8170 ] +[ "file_id", 8172, "file_id", 8172, 8172, 11, 8172 ] +[ "sn", 8169, "sn", 8169, 8169, 11, 8169 ] +[ "file_id", 8169, "file_id", 8169, 8169, 11, 8169 ] +[ "file_id", 8171, "file_id", 8171, 8171, 11, 8171 ] +[ "id", 8189, "id", 8189, 8189, 11, 8189 ] +[ "file_id", 8189, "file_id", 8189, 8189, 11, 8189 ] +[ "file_id", 8191, "file_id", 8191, 8191, 11, 8191 ] +[ "id", 8188, "id", 8188, 8188, 11, 8188 ] +[ "file_id", 8188, "file_id", 8188, 8188, 11, 8188 ] +[ "file_id", 8190, "file_id", 8190, 8190, 11, 8190 ] +[ "id", 8201, "id", 8201, 8201, 11, 8201 ] +[ "file_id", 8201, "file_id", 8201, 8201, 11, 8201 ] +[ "file_id", 8203, "file_id", 8203, 8203, 11, 8203 ] +[ "id", 8200, "id", 8200, 8200, 11, 8200 ] +[ "file_id", 8200, "file_id", 8200, 8200, 11, 8200 ] +[ "file_id", 8202, "file_id", 8202, 8202, 11, 8202 ] +[ "id", 8300, "id", 8300, 8300, 11, 8300 ] +[ "id", 8299, "id", 8299, 8299, 11, 8299 ] +#ROLLBACK; # 13:47:14 > # 13:47:14 > "Done." _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
