Changeset: 57d7a36418e4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=57d7a36418e4
Modified Files:
sql/test/pg_regress/Tests/create_misc.sql
sql/test/pg_regress/Tests/create_view.sql
sql/test/pg_regress/Tests/create_view.stable.err
sql/test/pg_regress/Tests/create_view.stable.out
sql/test/pg_regress/postgresql2sql99.sh
Branch: default
Log Message:
Adpated create_misc and create_view to MonetDB SQL syntax
Added substitution rules to postgresql2sql99.sh
diffs (truncated from 370 to 300 lines):
diff --git a/sql/test/pg_regress/Tests/create_misc.sql
b/sql/test/pg_regress/Tests/create_misc.sql
--- a/sql/test/pg_regress/Tests/create_misc.sql
+++ b/sql/test/pg_regress/Tests/create_misc.sql
@@ -6,52 +6,61 @@
-- (any resemblance to real life is purely coincidental)
--
-INSERT INTO tenk2 VALUES (tenk1.*);
+--INSERT INTO tenk2 VALUES (tenk1.*);
+INSERT INTO tenk2 SELECT * FROM tenk1;
-SELECT * INTO TABLE onek2 FROM onek;
+CREATE TABLE onek2 AS
+SELECT *
+-- INTO TABLE onek2
+ FROM onek
+WITH DATA;
+--INSERT INTO fast_emp4000 VALUES (slow_emp4000.*);
+INSERT INTO fast_emp4000 (SELECT * FROM slow_emp4000);
-INSERT INTO fast_emp4000 VALUES (slow_emp4000.*);
+CREATE TABLE Bprime AS
+SELECT *
+-- INTO TABLE Bprime
+ FROM tenk1
+ WHERE unique2 < 1000
+WITH DATA;
-SELECT *
- INTO TABLE Bprime
- FROM tenk1
- WHERE unique2 < 1000;
-
-INSERT INTO hobbies_r (string, person)
- SELECT 'posthacking', p.string
- FROM person* p
+INSERT INTO hobbies_r (name, person)
+ SELECT 'posthacking', p.name
+ FROM person p
WHERE p.name = 'mike' or p.name = 'jeff';
-INSERT INTO hobbies_r (string, person)
- SELECT 'basketball', p.string
+INSERT INTO hobbies_r (name, person)
+ SELECT 'basketball', p.name
FROM person p
WHERE p.name = 'joe' or p.name = 'sally';
INSERT INTO hobbies_r (name) VALUES ('skywalking');
-INSERT INTO equipment_r (string, hobby) VALUES ('advil', 'posthacking');
+INSERT INTO equipment_r (name, hobby) VALUES ('advil', 'posthacking');
-INSERT INTO equipment_r (string, hobby) VALUES ('peet''s coffee',
'posthacking');
+INSERT INTO equipment_r (name, hobby) VALUES ('peet''s coffee', 'posthacking');
-INSERT INTO equipment_r (string, hobby) VALUES ('hightops', 'basketball');
+INSERT INTO equipment_r (name, hobby) VALUES ('hightops', 'basketball');
-INSERT INTO equipment_r (string, hobby) VALUES ('guts', 'skywalking');
+INSERT INTO equipment_r (name, hobby) VALUES ('guts', 'skywalking');
+CREATE TABLE ramp AS
SELECT *
- INTO TABLE ramp
+-- INTO TABLE ramp
FROM road
- WHERE name ~ '.*Ramp';
+ WHERE name = '.*Ramp'
+WITH DATA;
INSERT INTO ihighway
SELECT *
FROM road
- WHERE name ~ 'I- .*';
+ WHERE name = 'I- .*';
-INSERT INTO shighway
- SELECT *
+INSERT INTO shighway (name, thepath)
+ SELECT *
FROM road
- WHERE name ~ 'State Hwy.*';
+ WHERE name = 'State Hwy.*';
UPDATE shighway
SET surface = 'asphalt';
@@ -62,129 +71,129 @@ INSERT INTO a_star (class, a) VALUES ('a
INSERT INTO a_star (class) VALUES ('a');
-INSERT INTO b_star (class, a, b) VALUES ('b', 3, 'mumble'::text);
+INSERT INTO b_star (class, a, b) VALUES ('b', 3, cast('mumble' as text));
INSERT INTO b_star (class, a) VALUES ('b', 4);
-INSERT INTO b_star (class, b) VALUES ('b', 'bumble'::text);
+INSERT INTO b_star (class, b) VALUES ('b', cast('bumble' as text));
INSERT INTO b_star (class) VALUES ('b');
-INSERT INTO c_star (class, a, c) VALUES ('c', 5, 'hi mom'::name);
+INSERT INTO c_star (class, a, c) VALUES ('c', 5, cast('hi mom' as string));
INSERT INTO c_star (class, a) VALUES ('c', 6);
-INSERT INTO c_star (class, c) VALUES ('c', 'hi paul'::name);
+INSERT INTO c_star (class, c) VALUES ('c', cast('hi paul' as string));
INSERT INTO c_star (class) VALUES ('c');
INSERT INTO d_star (class, a, b, c, d)
- VALUES ('d', 7, 'grumble'::text, 'hi sunita'::string, '0.0'::double);
+ VALUES ('d', 7, cast('grumble' as text), cast('hi sunita' as string),
cast('0.0' as double));
INSERT INTO d_star (class, a, b, c)
- VALUES ('d', 8, 'stumble'::text, 'hi koko'::name);
+ VALUES ('d', 8, cast('stumble' as text), cast('hi koko' as string));
INSERT INTO d_star (class, a, b, d)
- VALUES ('d', 9, 'rumble'::text, '1.1'::double);
+ VALUES ('d', 9, cast('rumble' as text), cast('1.1' as double));
INSERT INTO d_star (class, a, c, d)
- VALUES ('d', 10, 'hi kristin'::string, '10.01'::double);
+ VALUES ('d', 10, cast('hi kristin' as string), cast('10.01' as double));
INSERT INTO d_star (class, b, c, d)
- VALUES ('d', 'crumble'::text, 'hi boris'::string, '100.001'::double);
+ VALUES ('d', cast('crumble' as text), cast('hi boris' as string),
cast('100.001' as double));
INSERT INTO d_star (class, a, b)
- VALUES ('d', 11, 'fumble'::text);
+ VALUES ('d', 11, cast('fumble' as text));
INSERT INTO d_star (class, a, c)
- VALUES ('d', 12, 'hi avi'::name);
+ VALUES ('d', 12, cast('hi avi' as string));
INSERT INTO d_star (class, a, d)
- VALUES ('d', 13, '1000.0001'::double);
+ VALUES ('d', 13, cast('1000.0001' as double));
INSERT INTO d_star (class, b, c)
- VALUES ('d', 'tumble'::text, 'hi andrew'::name);
+ VALUES ('d', cast('tumble' as text), cast('hi andrew' as string));
INSERT INTO d_star (class, b, d)
- VALUES ('d', 'humble'::text, '10000.00001'::double);
+ VALUES ('d', cast('humble' as text), cast('10000.00001' as double));
INSERT INTO d_star (class, c, d)
- VALUES ('d', 'hi ginger'::string, '100000.000001'::double);
+ VALUES ('d', cast('hi ginger' as string), cast('100000.000001' as double));
INSERT INTO d_star (class, a) VALUES ('d', 14);
-INSERT INTO d_star (class, b) VALUES ('d', 'jumble'::text);
+INSERT INTO d_star (class, b) VALUES ('d', cast('jumble' as text));
-INSERT INTO d_star (class, c) VALUES ('d', 'hi jolly'::name);
+INSERT INTO d_star (class, c) VALUES ('d', cast('hi jolly' as string));
-INSERT INTO d_star (class, d) VALUES ('d', '1000000.0000001'::double);
+INSERT INTO d_star (class, d) VALUES ('d', cast('1000000.0000001' as double));
INSERT INTO d_star (class) VALUES ('d');
INSERT INTO e_star (class, a, c, e)
- VALUES ('e', 15, 'hi carol'::string, '-1'::smallint);
+ VALUES ('e', 15, cast('hi carol' as string), cast('-1' as smallint));
INSERT INTO e_star (class, a, c)
- VALUES ('e', 16, 'hi bob'::name);
+ VALUES ('e', 16, cast('hi bob' as string));
INSERT INTO e_star (class, a, e)
- VALUES ('e', 17, '-2'::smallint);
+ VALUES ('e', 17, cast('-2' as smallint));
INSERT INTO e_star (class, c, e)
- VALUES ('e', 'hi michelle'::string, '-3'::smallint);
+ VALUES ('e', cast('hi michelle' as string), cast('-3' as smallint));
INSERT INTO e_star (class, a)
VALUES ('e', 18);
INSERT INTO e_star (class, c)
- VALUES ('e', 'hi elisa'::name);
+ VALUES ('e', cast('hi elisa' as string));
INSERT INTO e_star (class, e)
- VALUES ('e', '-4'::smallint);
+ VALUES ('e', cast('-4' as smallint));
INSERT INTO f_star (class, a, c, e, f)
- VALUES ('f', 19, 'hi claire'::string, '-5'::smallint,
'(1,3),(2,4)'::string);
+ VALUES ('f', 19, cast('hi claire' as string), cast('-5' as smallint),
cast('(1,3),(2,4)' as string));
INSERT INTO f_star (class, a, c, e)
- VALUES ('f', 20, 'hi mike'::string, '-6'::smallint);
+ VALUES ('f', 20, cast('hi mike' as string), cast('-6' as smallint));
INSERT INTO f_star (class, a, c, f)
- VALUES ('f', 21, 'hi marcel'::string, '(11,44),(22,55),(33,66)'::string);
+ VALUES ('f', 21, cast('hi marcel' as string),
cast('(11,44),(22,55),(33,66)' as string));
INSERT INTO f_star (class, a, e, f)
- VALUES ('f', 22, '-7'::smallint,
'(111,555),(222,666),(333,777),(444,888)'::string);
+ VALUES ('f', 22, cast('-7' as smallint),
cast('(111,555),(222,666),(333,777),(444,888)' as string));
INSERT INTO f_star (class, c, e, f)
- VALUES ('f', 'hi keith'::string, '-8'::smallint,
- '(1111,3333),(2222,4444)'::string);
+ VALUES ('f', cast('hi keith' as string), cast('-8' as smallint),
+ cast('(1111,3333),(2222,4444)' as string));
INSERT INTO f_star (class, a, c)
- VALUES ('f', 24, 'hi marc'::name);
+ VALUES ('f', 24, cast('hi marc' as string));
INSERT INTO f_star (class, a, e)
- VALUES ('f', 25, '-9'::smallint);
+ VALUES ('f', 25,cast( '-9' as smallint));
INSERT INTO f_star (class, a, f)
- VALUES ('f', 26, '(11111,33333),(22222,44444)'::string);
+ VALUES ('f', 26, cast('(11111,33333),(22222,44444)' as string));
INSERT INTO f_star (class, c, e)
- VALUES ('f', 'hi allison'::string, '-10'::smallint);
+ VALUES ('f', cast('hi allison' as string), cast('-10' as smallint));
INSERT INTO f_star (class, c, f)
- VALUES ('f', 'hi jeff'::string,
- '(111111,333333),(222222,444444)'::string);
+ VALUES ('f', cast('hi jeff' as string),
+ cast('(111111,333333),(222222,444444)' as string));
INSERT INTO f_star (class, e, f)
- VALUES ('f', '-11'::smallint,
'(1111111,3333333),(2222222,4444444)'::string);
+ VALUES ('f', cast('-11' as smallint),
cast('(1111111,3333333),(2222222,4444444)' as string));
INSERT INTO f_star (class, a) VALUES ('f', 27);
-INSERT INTO f_star (class, c) VALUES ('f', 'hi carl'::name);
+INSERT INTO f_star (class, c) VALUES ('f', cast('hi carl' as string));
-INSERT INTO f_star (class, e) VALUES ('f', '-12'::smallint);
+INSERT INTO f_star (class, e) VALUES ('f', cast('-12' as smallint));
INSERT INTO f_star (class, f)
- VALUES ('f', '(11111111,33333333),(22222222,44444444)'::string);
+ VALUES ('f', cast('(11111111,33333333),(22222222,44444444)' as string));
INSERT INTO f_star (class) VALUES ('f');
@@ -199,7 +208,7 @@ CREATE TABLE iportaltest (
);
INSERT INTO iportaltest (i, d, p)
- VALUES (1, 3.567, '(3.0,1.0),(4.0,2.0)'::string);
+ VALUES (1, 3.567, cast('(3.0,1.0),(4.0,2.0)' as string));
INSERT INTO iportaltest (i, d, p)
- VALUES (2, 89.05, '(4.0,2.0),(3.0,1.0)'::string);
+ VALUES (2, 89.05, cast('(4.0,2.0),(3.0,1.0)' as string));
diff --git a/sql/test/pg_regress/Tests/create_view.sql
b/sql/test/pg_regress/Tests/create_view.sql
--- a/sql/test/pg_regress/Tests/create_view.sql
+++ b/sql/test/pg_regress/Tests/create_view.sql
@@ -5,18 +5,18 @@
--
CREATE VIEW street AS
- SELECT r.string, r.thepath, c.cname AS cname
+ SELECT r.name, r.thepath, c.cname AS cname
FROM road r, real_city c
- WHERE c.outline ## r.thepath;
+ WHERE c.outline = r.thepath;
CREATE VIEW iexit AS
- SELECT ih.string, ih.thepath,
+ SELECT ih.name, ih.thepath,
interpt_pp(ih.thepath, r.thepath) AS exit
FROM ihighway ih, ramp r
- WHERE ih.thepath ## r.thepath;
+ WHERE ih.thepath = r.thepath;
CREATE VIEW toyemp AS
- SELECT string, age, location, 12*salary AS annualsal
+ SELECT name, age, location, 12*salary AS annualsal
FROM emp;
-- Test comments
@@ -29,7 +29,7 @@ CREATE VIEW toyemp AS
--
CREATE TABLE viewtest_tbl (a int, b int);
-COPY viewtest_tbl FROM stdin;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
