Changeset: 39044115a326 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=39044115a326
Modified Files:
sql/test/pg_regress/Tests/All
sql/test/pg_regress/Tests/comments.sql
sql/test/pg_regress/Tests/comments.stable.err
sql/test/pg_regress/Tests/comments.stable.out
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
sql/test/pg_regress/Tests/interval.sql
sql/test/pg_regress/Tests/interval.stable.err
sql/test/pg_regress/Tests/interval.stable.out
sql/test/pg_regress/Tests/reltime.sql
sql/test/pg_regress/Tests/reltime.stable.err
sql/test/pg_regress/Tests/reltime.stable.out
sql/test/pg_regress/postgresql2sql99.sh
Branch: RIntegration-default
Log Message:
Merged with default branch.
diffs (truncated from 1302 to 300 lines):
diff --git a/sql/test/pg_regress/Tests/All b/sql/test/pg_regress/Tests/All
--- a/sql/test/pg_regress/Tests/All
+++ b/sql/test/pg_regress/Tests/All
@@ -41,7 +41,7 @@ timestamptz
interval
# abstime NOT supported ABSTIME, deprecated in Postgresql
reltime
-tinterval
+# tinterval NOT supported in MonetDB, deprecated in Postgresql and is also not
standard SQL so exclude this test
inet
comments
geometry
diff --git a/sql/test/pg_regress/Tests/comments.sql
b/sql/test/pg_regress/Tests/comments.sql
--- a/sql/test/pg_regress/Tests/comments.sql
+++ b/sql/test/pg_regress/Tests/comments.sql
@@ -3,7 +3,7 @@
--
SELECT 'trailing' AS first; -- trailing single line
-SELECT /* embedded single line */ 'embedded' AS second;
+SELECT /* embedded single line */ 'embedded' AS "second";
SELECT /* both embedded and trailing single line */ 'both' AS third; --
trailing single line
SELECT 'before multi-line' AS fourth;
diff --git a/sql/test/pg_regress/Tests/comments.stable.err
b/sql/test/pg_regress/Tests/comments.stable.err
--- a/sql/test/pg_regress/Tests/comments.stable.err
+++ b/sql/test/pg_regress/Tests/comments.stable.err
@@ -29,14 +29,32 @@ stderr of test 'comments` in directory '
# 17:11:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-1142" "--port=38959"
# 17:11:19 >
-#--
-#-- COMMENTS
-#--
-#--
-#-- Nested comments
-#--
+MAPI = (monetdb) /var/tmp/mtest-9610/.s.monetdb.36769
+QUERY = /* This block comment surrounds a query which itself has a block
comment...
+ SELECT /* embedded single line */ 'embedded' AS x2;
-# 17:11:19 >
-# 17:11:19 > "Done."
-# 17:11:19 >
+ !SELE"
+MAPI = (monetdb) /var/tmp/mtest-9610/.s.monetdb.36769
+QUERY = */
+ SELECT -- continued after the following block comments...
+ /* Deeply nested comment.
+ This includes a single apostrophe to make sure we aren't decoding
this part as a string.
+ SELECT 'deep nest' AS n1;
+ /* Second level of nesting...
+ SELECT 'deeper nest' as n2;
+ /* Third level of nesting...
+ SELECT 'deepest nest' as n3;
+ */
+ Hoo boy. Still two deep...
+ */
+ Now just one deep...
+ */
+ 'deeply nested example' AS sixth;
+
+
+
+# 16:12:37 >
+# 16:12:37 > "Done."
+# 16:12:37 >
+
diff --git a/sql/test/pg_regress/Tests/comments.stable.out
b/sql/test/pg_regress/Tests/comments.stable.out
--- a/sql/test/pg_regress/Tests/comments.stable.out
+++ b/sql/test/pg_regress/Tests/comments.stable.out
@@ -30,77 +30,38 @@ Ready.
#-- COMMENTS
#--
#SELECT 'trailing' AS first; -- trailing single line
-% sys.L0 # table_name
+% .L # table_name
% first # name
-% ? # type
-% ? # length
+% char # type
+% 8 # length
[ "trailing" ]
-
-#SELECT /* embedded single line */ 'embedded' AS second;
-% sys.L0 # table_name
+#SELECT /* embedded single line */ 'embedded' AS "second";
+% .L # table_name
% second # name
-% ? # type
-% ? # length
-[ "embedded" ]
-
+% char # type
+% 8 # length
+[ "embedded" ]
#SELECT /* both embedded and trailing single line */ 'both' AS third; --
trailing single line
-% sys.L0 # table_name
+% .L # table_name
% third # name
-% ? # type
-% ? # length
+% char # type
+% 4 # length
[ "both" ]
#SELECT 'before multi-line' AS fourth;
-% sys.L0 # table_name
+% .L # table_name
% fourth # name
-% ? # type
-% ? # length
+% char # type
+% 17 # length
[ "before multi-line" ]
-
-/* This is an example of SQL which should not execute:
- * select 'multi-line';
- */
#SELECT 'after multi-line' AS fifth;
-% sys.L0 # table_name
+% .L # table_name
% fifth # name
-% ? # type
-% ? # length
+% char # type
+% 16 # length
[ "after multi-line" ]
-#--
-#-- Nested comments
-#--
-/*
-#SELECT 'trailing' as x1; -- inside block comment
-*/
-/* This block comment surrounds a query which itself has a block comment...
-#SELECT /* embedded single line */ 'embedded' AS x2;
-*/
-#SELECT -- continued after the following block comments...
-#/* Deeply nested comment.
-# This includes a single apostrophe to make sure we aren't decoding this
part as a string.
-#SELECT 'deep nest' AS n1;
-/* Second level of nesting...
-#SELECT 'deeper nest' as n2;
-/* Third level of nesting...
-#SELECT 'deepest nest' as n3;
-*/
-Hoo boy. Still two deep...
-*/
-Now just one deep...
-*/
-'deeply nested example' AS sixth;
-% sys.L0 # table_name
-% sixth # name
-% ? # type
-% ? # length
-[ "deeply nested example" ]
+# 16:12:37 >
+# 16:12:37 > "Done."
+# 16:12:37 >
-/* and this is the end of the file */
-
-= ! 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/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 >
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
