Changeset: fad95961255a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fad95961255a Added Files: sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out.int128 Modified Files: sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out sql/test/testdb/Tests/testdb-dump.stable.out.Windows Branch: Dec2016 Log Message:
Approvals. diffs (68 lines): diff --git a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out --- a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out +++ b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out @@ -69,11 +69,11 @@ function user.s8_1():void; C_4:bat[:oid] := sql.tid(X_3,"sys","dbg"); X_7:bat[:int] := sql.bind(X_3,"sys","dbg","a",0:int); X_10 := algebra.projection(C_4,X_7); - (X_11,r1_14,r2_14) := group.subgroupdone(X_10); - X_14 := algebra.projection(r1_14,X_10); + (X_11,C1_14,r2_14) := group.subgroupdone(X_10); + X_14 := algebra.projection(C1_14,X_10); X_17:bat[:int] := sql.bind(X_3,"sys","dbg","b",0:int); X_19 := algebra.projection(C_4,X_17); - X_20:bat[:lng] := aggr.subsum(X_19,X_11,r1_14,true,true); + X_20:bat[:lng] := aggr.subsum(X_19,X_11,C1_14,true,true); X_15 := bat.setKey(X_14,true); X_22:bat[:lng] := batcalc./(X_20,2:bte); X_26:bat[:lng] := batcalc.*(X_22,2:bte); @@ -155,11 +155,11 @@ function user.s20_1():void; C_4:bat[:oid] := sql.tid(X_3,"sys","dbg"); X_7:bat[:int] := sql.bind(X_3,"sys","dbg","a",0:int); X_10 := algebra.projection(C_4,X_7); - (X_11,r1_14,r2_14) := group.subgroupdone(X_10); - X_14 := algebra.projection(r1_14,X_10); + (X_11,C1_14,r2_14) := group.subgroupdone(X_10); + X_14 := algebra.projection(C1_14,X_10); X_17:bat[:int] := sql.bind(X_3,"sys","dbg","b",0:int); X_19 := algebra.projection(C_4,X_17); - X_20:bat[:lng] := aggr.subsum(X_19,X_11,r1_14,true,true); + X_20:bat[:lng] := aggr.subsum(X_19,X_11,C1_14,true,true); X_15 := bat.setKey(X_14,true); X_22:bat[:lng] := batcalc./(X_20,2:bte); X_26:bat[:lng] := batcalc.*(X_22,2:bte); diff --git a/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out b/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out --- a/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out +++ b/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out @@ -400,12 +400,12 @@ Ready. #SELECT * FROM sys.tablestoragemodel WHERE schema NOT IN (SELECT name FROM sys.schemas); % .tablestoragemodel, .tablestoragemodel, .tablestoragemodel, .tablestoragemodel, .tablestoragemodel, .tablestoragemodel, .tablestoragemodel, .tablestoragemodel # table_name % schema, table, count, columnsize, heapsize, hashes, imprints, auxiliary # name -% clob, clob, bigint, bigint, bigint, bigint, bigint, hugeint # type +% clob, clob, bigint, bigint, bigint, bigint, bigint, bigint # type % 0, 0, 1, 1, 1, 1, 1, 1 # length #SELECT * FROM sys.tablestoragemodel WHERE table NOT IN (SELECT name FROM sys._tables); % .tablestoragemodel, .tablestoragemodel, .tablestoragemodel, .tablestoragemodel, .tablestoragemodel, .tablestoragemodel, .tablestoragemodel, .tablestoragemodel # table_name % schema, table, count, columnsize, heapsize, hashes, imprints, auxiliary # name -% clob, clob, bigint, bigint, bigint, bigint, bigint, hugeint # type +% clob, clob, bigint, bigint, bigint, bigint, bigint, bigint # type % 0, 0, 1, 1, 1, 1, 1, 1 # length # 16:15:38 > diff --git a/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out b/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out.int128 copy from sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out copy to sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out.int128 diff --git a/sql/test/testdb/Tests/testdb-dump.stable.out.Windows b/sql/test/testdb/Tests/testdb-dump.stable.out.Windows --- a/sql/test/testdb/Tests/testdb-dump.stable.out.Windows +++ b/sql/test/testdb/Tests/testdb-dump.stable.out.Windows @@ -101174,8 +101174,8 @@ CREATE TABLE "testschema"."typestest" ( "json" JSON ); COPY 2 RECORDS INTO "testschema"."typestest" FROM stdin USING DELIMITERS '\t','\n','"'; -true 10 10000 1000000 1000000 10000000000 1e+030 1e+020 1.000 123456789 12345.678 3.1415 3.1415 3.1415 2009-04-15 24 18 3 1728000.000 108000.000 120000.000 100000.000 36000.000 6000.000 2000.000 600.000 100.000 10.000 1995-07-15 07:30:00.000000 1995-07-15 07:30:00.00000 1995-07-15 07:30:00.000000+00:00 1995-07-15 07:30:00.00000+00:00 07:30:00 07:30:00.00000 07:30:00+00:00 07:30:00.00000+00:00 123456 123456 "123456" "123456" "𐤀" "varchar" "0123456789" 7d95a9ce-aeb8-4881-9cf7-60b4d55f9e45 192.168.10.0/24 {"f1":{"f12":3},"f2":[2,3,4]} -NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL +true 10 10000 1000000 10000000000 1e+030 1e+020 1.000 123456789 12345.678 3.1415 3.1415 3.1415 2009-04-15 24 18 3 1728000.000 108000.000 120000.000 100000.000 36000.000 6000.000 2000.000 600.000 100.000 10.000 1995-07-15 07:30:00.000000 1995-07-15 07:30:00.00000 1995-07-15 07:30:00.000000+00:00 1995-07-15 07:30:00.00000+00:00 07:30:00 07:30:00.00000 07:30:00+00:00 07:30:00.00000+00:00 123456 123456 "123456" "123456" "𐤀" "varchar" "0123456789" 7d95a9ce-aeb8-4881-9cf7-60b4d55f9e45 192.168.10.0/24 {"f1":{"f12":3},"f2":[2,3,4]} +NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL CREATE TABLE "testschema"."keytest1" ( "key1" INTEGER NOT NULL, "key2" INTEGER NOT NULL, _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list