Changeset: 2a684a0c5a27 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2a684a0c5a27
Modified Files:
sql/test/pg_regress/Tests/create_table.sql
sql/test/pg_regress/Tests/create_table.stable.err
sql/test/pg_regress/Tests/create_table.stable.out
sql/test/pg_regress/Tests/drop.sql
Branch: default
Log Message:
Corrected CREATE TABLE d_star missed column b.
diffs (194 lines):
diff --git a/sql/test/pg_regress/Tests/create_table.sql
b/sql/test/pg_regress/Tests/create_table.sql
--- a/sql/test/pg_regress/Tests/create_table.sql
+++ b/sql/test/pg_regress/Tests/create_table.sql
@@ -84,6 +84,7 @@ CREATE TABLE emp (
name text,
age integer,
location string,
+
salary integer,
manager string
); -- INHERITS (person)
@@ -93,6 +94,7 @@ CREATE TABLE student (
name text,
age integer,
location string,
+
gpa double
); -- INHERITS (person)
@@ -101,9 +103,12 @@ CREATE TABLE stud_emp (
name text,
age integer,
location string,
+
salary integer,
manager string,
+
gpa double,
+
percent integer
); -- INHERITS (emp, student)
@@ -140,6 +145,7 @@ CREATE TABLE ihighway (
CREATE TABLE shighway (
name text,
thepath string,
+
surface text
); -- INHERITS (road)
@@ -167,19 +173,24 @@ CREATE TABLE a_star (
CREATE TABLE b_star (
class char,
a integer,
+
b text
); -- INHERITS (a_star)
CREATE TABLE c_star (
class char,
a integer,
+
c string
); -- INHERITS (a_star)
CREATE TABLE d_star (
class char,
a integer,
+ b text,
+
c string,
+
d double
); -- INHERITS (b_star, c_star)
@@ -187,6 +198,7 @@ CREATE TABLE e_star (
class char,
a integer,
c string,
+
e smallint
); -- INHERITS (c_star)
@@ -195,6 +207,7 @@ CREATE TABLE f_star (
a integer,
c string,
e smallint,
+
f string
); -- INHERITS (e_star)
@@ -251,3 +264,5 @@ CREATE TABLE bt_f8_heap (
random integer
);
+
+-- in drop.sql all these tables are dropped
diff --git a/sql/test/pg_regress/Tests/create_table.stable.err
b/sql/test/pg_regress/Tests/create_table.stable.err
--- a/sql/test/pg_regress/Tests/create_table.stable.err
+++ b/sql/test/pg_regress/Tests/create_table.stable.err
@@ -25,35 +25,12 @@ stderr of test 'create_table` in directo
# cmdline opt mal_listing = 0
# cmdline opt gdk_debug = 536870922
-# 17:11:19 >
-# 17:11:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-1142" "--port=38959"
-# 17:11:19 >
+# 16:39:07 >
+# 16:39:07 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-9947" "--port=31148"
+# 16:39:07 >
-#--
-#-- CREATE_TABLE
-#--
-#--
-#-- CLASS DEFINITIONS
-#--
-#--
-#-- test the "star" operators a bit more thoroughly -- this time,
-#-- throw in lots of NULL fields...
-#--
-#-- a is the type root
-#-- b and c inherit from a (one-level single inheritance)
-#-- d inherits from b and c (two-level multiple inheritance)
-#-- e inherits from c (two-level single inheritance)
-#-- f inherits from e (three-level single inheritance)
-#--
-#-- don't include the hash_ovfl_heap stuff in the distribution
-#-- the data set is too large for what it's worth
-#--
-#-- CREATE TABLE hash_ovfl_heap (
-#-- x integer,
-#-- y integer
-#-- );
+
+# 16:40:13 >
+# 16:40:13 > "Done."
+# 16:40:13 >
-# 17:11:19 >
-# 17:11:19 > "Done."
-# 17:11:19 >
-
diff --git a/sql/test/pg_regress/Tests/create_table.stable.out
b/sql/test/pg_regress/Tests/create_table.stable.out
--- a/sql/test/pg_regress/Tests/create_table.stable.out
+++ b/sql/test/pg_regress/Tests/create_table.stable.out
@@ -24,8 +24,6 @@ Ready.
# 17:11:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-1142" "--port=38959"
# 17:11:19 >
-= ! Correct / expected output still needs to be provided / verified / approved
! =
-
#--
#-- CREATE_TABLE
#--
@@ -109,9 +107,6 @@ Ready.
#CREATE TABLE stud_emp (
# percent integer
#); -- INHERITS (emp, student)
-NOTICE: merging multiple inherited definitions of column "name"
-NOTICE: merging multiple inherited definitions of column "age"
-NOTICE: merging multiple inherited definitions of column "location"
#CREATE TABLE city (
# name string,
# location string,
@@ -160,11 +155,6 @@ NOTICE: merging multiple inherited defi
#CREATE TABLE c_star (
# c string
#); -- INHERITS (a_star)
-#CREATE TABLE d_star (
-# d double
-#); -- INHERITS (b_star, c_star)
-NOTICE: merging multiple inherited definitions of column "class"
-NOTICE: merging multiple inherited definitions of column "a"
#CREATE TABLE e_star (
# e smallint
#); -- INHERITS (c_star)
@@ -215,8 +205,6 @@ NOTICE: merging multiple inherited defi
# random integer
#);
-= ! Correct / expected output still needs to be provided / verified / approved
! =
-
# 17:11:19 >
# 17:11:19 > "Done."
# 17:11:19 >
diff --git a/sql/test/pg_regress/Tests/drop.sql
b/sql/test/pg_regress/Tests/drop.sql
--- a/sql/test/pg_regress/Tests/drop.sql
+++ b/sql/test/pg_regress/Tests/drop.sql
@@ -229,11 +229,11 @@ DROP TABLE bt_txt_heap;
DROP TABLE bt_f8_heap;
-DROP TABLE ABSTIME_TBL;
+-- DROP TABLE ABSTIME_TBL;
-DROP TABLE RELTIME_TBL;
+-- DROP TABLE RELTIME_TBL;
-DROP TABLE TINTERVAL_TBL;
+-- DROP TABLE TINTERVAL_TBL;
--
-- VIRTUAL CLASS REMOVAL
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
