Changeset: 7431f248c36a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7431f248c36a Modified Files: sql/src/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out sql/src/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.stable.out sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.out sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out sql/src/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out sql/src/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out sql/src/test/BugTracker/Tests/multi-column-constraint.SF-1964587.stable.out sql/src/test/Dump/Tests/dump.stable.out sql/src/test/Dump/Tests/dump.stable.out.Windows sql/src/test/UserDump/Tests/create.stable.out Branch: default Log Message:
fix for uppercase types diffs (truncated from 794 to 300 lines): diff -r d0e1010b5edd -r 7431f248c36a sql/src/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out --- a/sql/src/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out Wed Aug 11 14:18:00 2010 +0200 +++ b/sql/src/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out Wed Aug 11 14:18:00 2010 +0200 @@ -116,11 +116,11 @@ START TRANSACTION; SET SCHEMA "sys"; CREATE TABLE "sys"."allnewtriples" ( - "id" int NOT NULL, - "subject" int NOT NULL, - "predicate" int NOT NULL, - "object" int NOT NULL, - "explicit" boolean NOT NULL, + "id" INTEGER NOT NULL, + "subject" INTEGER NOT NULL, + "predicate" INTEGER NOT NULL, + "object" INTEGER NOT NULL, + "explicit" BOOLEAN NOT NULL, CONSTRAINT "allnewtriples_id_pkey" PRIMARY KEY ("id"), CONSTRAINT "unique_key" UNIQUE ("subject", "predicate", "object") ); @@ -136,10 +136,10 @@ 6 2 2 1 false 7 2 2 2 false CREATE TABLE "sys"."foreign" ( - "id" int NOT NULL, - "subject" int NOT NULL, - "predicate" int NOT NULL, - "object" int NOT NULL + "id" INTEGER NOT NULL, + "subject" INTEGER NOT NULL, + "predicate" INTEGER NOT NULL, + "object" INTEGER NOT NULL ); COPY 7 RECORDS INTO "sys"."foreign" FROM stdin USING DELIMITERS '\t','\n','"'; 1 1 1 1 @@ -150,11 +150,11 @@ 6 1 2 1 7 1 1 2 CREATE TABLE "sys"."triples" ( - "id" int NOT NULL, - "subject" int NOT NULL, - "predicate" int NOT NULL, - "object" int NOT NULL, - "explicit" boolean NOT NULL, + "id" INTEGER NOT NULL, + "subject" INTEGER NOT NULL, + "predicate" INTEGER NOT NULL, + "object" INTEGER NOT NULL, + "explicit" BOOLEAN NOT NULL, CONSTRAINT "triples_subject_predicate_object_unique" UNIQUE ("subject", "predicate", "object") ); CREATE INDEX "triples_object_idx" ON "sys"."triples" ("object"); diff -r d0e1010b5edd -r 7431f248c36a sql/src/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.stable.out --- a/sql/src/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.stable.out Wed Aug 11 14:18:00 2010 +0200 +++ b/sql/src/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.stable.out Wed Aug 11 14:18:00 2010 +0200 @@ -147,11 +147,11 @@ REFERENCES "disk" ("disk_id"); operation successful CREATE TABLE "sys"."experiment" ( - "exp_id" int NOT NULL, - "user_id" int, - "config_id" int, - "table_id" int, - "result_id" int, + "exp_id" INTEGER NOT NULL, + "user_id" INTEGER, + "config_id" INTEGER, + "table_id" INTEGER, + "result_id" INTEGER, CONSTRAINT "experiment_exp_id_pkey" PRIMARY KEY ("exp_id"), CONSTRAINT "experiment_config_id_fkey" FOREIGN KEY ("config_id") REFERENCES "sys"."config" ("config_id"), CONSTRAINT "experiment_result_id_fkey" FOREIGN KEY ("result_id") REFERENCES "sys"."result" ("result_id"), @@ -159,49 +159,49 @@ CONSTRAINT "experiment_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "sys"."tapestry_user" ("user_id") ); CREATE TABLE "sys"."tapestry_user" ( - "user_id" int NOT NULL, - "name" varchar(25), - "email" varchar(50), - "createdate" date, - "passwd" varchar(50), + "user_id" INTEGER NOT NULL, + "name" VARCHAR(25), + "email" VARCHAR(50), + "createdate" DATE, + "passwd" VARCHAR(50), CONSTRAINT "tapestry_user_user_id_pkey" PRIMARY KEY ("user_id") ); CREATE TABLE "sys"."config" ( - "config_id" int NOT NULL, - "name" varchar(25), - "target_id" int, - "sysinf_id" int, + "config_id" INTEGER NOT NULL, + "name" VARCHAR(25), + "target_id" INTEGER, + "sysinf_id" INTEGER, CONSTRAINT "config_config_id_pkey" PRIMARY KEY ("config_id"), CONSTRAINT "config_sysinf_id_fkey" FOREIGN KEY ("sysinf_id") REFERENCES "sys"."sysinf" ("sysinf_id"), CONSTRAINT "config_target_id_fkey" FOREIGN KEY ("target_id") REFERENCES "sys"."target" ("target_id") ); CREATE TABLE "sys"."tapestry_table" ( - "table_id" int NOT NULL, - "nrrows" int, - "nrcols" int, - "seed" int, - "fast" int, + "table_id" INTEGER NOT NULL, + "nrrows" INTEGER, + "nrcols" INTEGER, + "seed" INTEGER, + "fast" INTEGER, CONSTRAINT "tapestry_table_table_id_pkey" PRIMARY KEY ("table_id") ); CREATE TABLE "sys"."result" ( - "result_id" int NOT NULL, - "type" varchar(10), - "description" varchar(256), + "result_id" INTEGER NOT NULL, + "type" VARCHAR(10), + "description" VARCHAR(256), CONSTRAINT "result_result_id_pkey" PRIMARY KEY ("result_id") ); CREATE TABLE "sys"."target" ( - "target_id" int NOT NULL, - "name" varchar(50), - "permission" varchar(10), - "comment" varchar(256), + "target_id" INTEGER NOT NULL, + "name" VARCHAR(50), + "permission" VARCHAR(10), + "comment" VARCHAR(256), CONSTRAINT "target_target_id_pkey" PRIMARY KEY ("target_id") ); CREATE TABLE "sys"."sysinf" ( - "sysinf_id" int NOT NULL, - "platform_id" int, - "cpu_id" int, - "memory_id" int, - "disk_id" int, + "sysinf_id" INTEGER NOT NULL, + "platform_id" INTEGER, + "cpu_id" INTEGER, + "memory_id" INTEGER, + "disk_id" INTEGER, CONSTRAINT "sysinf_sysinf_id_pkey" PRIMARY KEY ("sysinf_id"), CONSTRAINT "sysinf_cpu_id_fkey" FOREIGN KEY ("cpu_id") REFERENCES "sys"."cpu" ("cpu_id"), CONSTRAINT "sysinf_disk_id_fkey" FOREIGN KEY ("disk_id") REFERENCES "sys"."disk" ("disk_id"), @@ -209,37 +209,37 @@ CONSTRAINT "sysinf_platform_id_fkey" FOREIGN KEY ("platform_id") REFERENCES "sys"."platform" ("platform_id") ); CREATE TABLE "sys"."platform" ( - "platform_id" int NOT NULL, - "name" varchar(50), - "comment" varchar(256), + "platform_id" INTEGER NOT NULL, + "name" VARCHAR(50), + "comment" VARCHAR(256), CONSTRAINT "platform_platform_id_pkey" PRIMARY KEY ("platform_id") ); CREATE TABLE "sys"."cpu" ( - "cpu_id" int NOT NULL, - "type" varchar(50), + "cpu_id" INTEGER NOT NULL, + "type" VARCHAR(50), CONSTRAINT "cpu_cpu_id_pkey" PRIMARY KEY ("cpu_id") ); CREATE TABLE "sys"."memory" ( - "memory_id" int NOT NULL, - "type" varchar(50), - "size" int, + "memory_id" INTEGER NOT NULL, + "type" VARCHAR(50), + "size" INTEGER, CONSTRAINT "memory_memory_id_pkey" PRIMARY KEY ("memory_id") ); CREATE TABLE "sys"."disk" ( - "disk_id" int NOT NULL, - "type" varchar(50), - "size" int, + "disk_id" INTEGER NOT NULL, + "type" VARCHAR(50), + "size" INTEGER, CONSTRAINT "disk_disk_id_pkey" PRIMARY KEY ("disk_id") ); CREATE TABLE "sys"."query_walk" ( - "walk_id" int NOT NULL, - "begin_x" int, - "begin_y" int, - "nr_runs" int, - "nr_steps" int, - "step_size" int, - "end_x" int, - "end_y" int, + "walk_id" INTEGER NOT NULL, + "begin_x" INTEGER, + "begin_y" INTEGER, + "nr_runs" INTEGER, + "nr_steps" INTEGER, + "step_size" INTEGER, + "end_x" INTEGER, + "end_y" INTEGER, CONSTRAINT "query_walk_walk_id_pkey" PRIMARY KEY ("walk_id") ); DROP TABLE "query_walk" CASCADE; diff -r d0e1010b5edd -r 7431f248c36a sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.out --- a/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.out Wed Aug 11 14:18:00 2010 +0200 +++ b/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.out Wed Aug 11 14:18:00 2010 +0200 @@ -26,25 +26,25 @@ # 12:59:51 > CREATE TABLE "sys"."triggers" ( - "id" int, - "name" varchar(1024), - "table_id" int, - "time" smallint, - "orientation" smallint, - "event" smallint, - "old_name" varchar(1024), - "new_name" varchar(1024), - "condition" varchar(2048), - "statement" varchar(2048) + "id" INTEGER, + "name" VARCHAR(1024), + "table_id" INTEGER, + "time" SMALLINT, + "orientation" SMALLINT, + "event" SMALLINT, + "old_name" VARCHAR(1024), + "new_name" VARCHAR(1024), + "condition" VARCHAR(2048), + "statement" VARCHAR(2048) ); CREATE TABLE "sys"."args" ( - "id" int, - "func_id" int, - "name" varchar(256), - "type" varchar(1024), - "type_digits" int, - "type_scale" int, - "number" int + "id" INTEGER, + "func_id" INTEGER, + "name" VARCHAR(256), + "type" VARCHAR(1024), + "type_digits" INTEGER, + "type_scale" INTEGER, + "number" INTEGER ); % sys.node_tags # table_name % id # name diff -r d0e1010b5edd -r 7431f248c36a sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out --- a/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out Wed Aug 11 14:18:00 2010 +0200 +++ b/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--performance.stable.out Wed Aug 11 14:18:00 2010 +0200 @@ -26,25 +26,25 @@ # 20:57:34 > CREATE TABLE "sys"."triggers" ( - "id" int, - "name" varchar(1024), - "table_id" int, - "time" smallint, - "orientation" smallint, - "event" smallint, - "old_name" varchar(1024), - "new_name" varchar(1024), - "condition" varchar(2048), - "statement" varchar(2048) + "id" INTEGER, + "name" VARCHAR(1024), + "table_id" INTEGER, + "time" SMALLINT, + "orientation" SMALLINT, + "event" SMALLINT, + "old_name" VARCHAR(1024), + "new_name" VARCHAR(1024), + "condition" VARCHAR(2048), + "statement" VARCHAR(2048) ); CREATE TABLE "sys"."args" ( - "id" int, - "func_id" int, - "name" varchar(256), - "type" varchar(1024), - "type_digits" int, - "type_scale" int, - "number" int + "id" INTEGER, + "func_id" INTEGER, + "name" VARCHAR(256), + "type" VARCHAR(1024), + "type_digits" INTEGER, + "type_scale" INTEGER, + "number" INTEGER ); % sys.node_tags # table_name % id # name diff -r d0e1010b5edd -r 7431f248c36a sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out --- a/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out Wed Aug 11 14:18:00 2010 +0200 +++ b/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.stable.out Wed Aug 11 14:18:00 2010 +0200 _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list