From 6f3de1bb6673b2e8d4ca83a17a482c5c546cd71e Mon Sep 17 00:00:00 2001 From: "Thomas G. Lockhart" Date: Sun, 30 Aug 1998 19:54:04 +0000 Subject: [PATCH] Types removed from Postgres: oidint2, oidint4, oidname. Fix example columns in alter_table.out to use datetime and timespan as a substitute for oidint4 and oidname. --- src/test/regress/expected/alter_table.out | 16 ++--- src/test/regress/expected/oidint2-FreeBSD.out | 66 ------------------- src/test/regress/expected/oidint2-NetBSD.out | 66 ------------------- src/test/regress/expected/oidint2-SunOS.out | 66 ------------------- src/test/regress/expected/oidint2.out | 66 ------------------- src/test/regress/expected/oidint4-FreeBSD.out | 66 ------------------- src/test/regress/expected/oidint4-NetBSD.out | 66 ------------------- src/test/regress/expected/oidint4-SunOS.out | 66 ------------------- src/test/regress/expected/oidint4.out | 66 ------------------- src/test/regress/expected/oidname.out | 63 ------------------ src/test/regress/sql/alter_table.sql | 8 +-- src/test/regress/sql/oidint2.sql | 47 ------------- src/test/regress/sql/oidint4.sql | 46 ------------- src/test/regress/sql/oidname.sql | 39 ----------- src/test/regress/sql/tests | 3 - 15 files changed, 12 insertions(+), 738 deletions(-) delete mode 100644 src/test/regress/expected/oidint2-FreeBSD.out delete mode 100644 src/test/regress/expected/oidint2-NetBSD.out delete mode 100644 src/test/regress/expected/oidint2-SunOS.out delete mode 100644 src/test/regress/expected/oidint2.out delete mode 100644 src/test/regress/expected/oidint4-FreeBSD.out delete mode 100644 src/test/regress/expected/oidint4-NetBSD.out delete mode 100644 src/test/regress/expected/oidint4-SunOS.out delete mode 100644 src/test/regress/expected/oidint4.out delete mode 100644 src/test/regress/expected/oidname.out delete mode 100644 src/test/regress/sql/oidint2.sql delete mode 100644 src/test/regress/sql/oidint4.sql delete mode 100644 src/test/regress/sql/oidname.sql diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out index 0d218eec6a..7b08aed5a9 100644 --- a/src/test/regress/expected/alter_table.out +++ b/src/test/regress/expected/alter_table.out @@ -10,7 +10,7 @@ QUERY: ALTER TABLE temp ADD COLUMN h abstime; QUERY: ALTER TABLE temp ADD COLUMN i char; QUERY: ALTER TABLE temp ADD COLUMN j abstime[]; QUERY: ALTER TABLE temp ADD COLUMN k dt; -ERROR: type name lookup of dt failed +ERROR: type name lookup of dt failed QUERY: ALTER TABLE temp ADD COLUMN l tid; QUERY: ALTER TABLE temp ADD COLUMN m xid; QUERY: ALTER TABLE temp ADD COLUMN n oid8; @@ -20,8 +20,8 @@ QUERY: ALTER TABLE temp ADD COLUMN r lseg; QUERY: ALTER TABLE temp ADD COLUMN s path; QUERY: ALTER TABLE temp ADD COLUMN t box; QUERY: ALTER TABLE temp ADD COLUMN u tinterval; -QUERY: ALTER TABLE temp ADD COLUMN v oidint4; -QUERY: ALTER TABLE temp ADD COLUMN w oidname; +QUERY: ALTER TABLE temp ADD COLUMN v datetime; +QUERY: ALTER TABLE temp ADD COLUMN w timespan; QUERY: ALTER TABLE temp ADD COLUMN x float8[]; QUERY: ALTER TABLE temp ADD COLUMN y float4[]; QUERY: ALTER TABLE temp ADD COLUMN z int2[]; @@ -33,7 +33,7 @@ QUERY: INSERT INTO temp (a, b, c, d, e, f, g, h, i, j, k, l, m, n, p, q, r, s, t '1 2 3 4 5 6 7 8', 'magnetic disk', '(1.1,1.1)', '(4.1,4.1,3.1,3.1)', '(0,2,4.1,4.1,3.1,3.1)', '(4.1,4.1,3.1,3.1)', '["current" "infinity"]', '1/3', '1,name', '{1.0,2.0,3.0,4.0}', '{1.0,2.0,3.0,4.0}', '{1,2,3,4}'); -ERROR: Relation temp does not have attribute k +ERROR: Relation temp does not have attribute k QUERY: SELECT * FROM temp; initial|a|b|c|d|e|f|g|h|i|j|l|m|n|p|q|r|s|t|u|v|w|x|y|z -------+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+- @@ -54,7 +54,7 @@ QUERY: ALTER TABLE temp ADD COLUMN h abstime; QUERY: ALTER TABLE temp ADD COLUMN i char; QUERY: ALTER TABLE temp ADD COLUMN j abstime[]; QUERY: ALTER TABLE temp ADD COLUMN k dt; -ERROR: type name lookup of dt failed +ERROR: type name lookup of dt failed QUERY: ALTER TABLE temp ADD COLUMN l tid; QUERY: ALTER TABLE temp ADD COLUMN m xid; QUERY: ALTER TABLE temp ADD COLUMN n oid8; @@ -64,8 +64,8 @@ QUERY: ALTER TABLE temp ADD COLUMN r lseg; QUERY: ALTER TABLE temp ADD COLUMN s path; QUERY: ALTER TABLE temp ADD COLUMN t box; QUERY: ALTER TABLE temp ADD COLUMN u tinterval; -QUERY: ALTER TABLE temp ADD COLUMN v oidint4; -QUERY: ALTER TABLE temp ADD COLUMN w oidname; +QUERY: ALTER TABLE temp ADD COLUMN v datetime; +QUERY: ALTER TABLE temp ADD COLUMN w timespan; QUERY: ALTER TABLE temp ADD COLUMN x float8[]; QUERY: ALTER TABLE temp ADD COLUMN y float4[]; QUERY: ALTER TABLE temp ADD COLUMN z int2[]; @@ -77,7 +77,7 @@ QUERY: INSERT INTO temp (a, b, c, d, e, f, g, h, i, j, k, l, m, n, p, q, r, s, t '1 2 3 4 5 6 7 8', 'magnetic disk', '(1.1,1.1)', '(4.1,4.1,3.1,3.1)', '(0,2,4.1,4.1,3.1,3.1)', '(4.1,4.1,3.1,3.1)', '["current" "infinity"]', '1/3', '1,name', '{1.0,2.0,3.0,4.0}', '{1.0,2.0,3.0,4.0}', '{1,2,3,4}'); -ERROR: Relation temp does not have attribute k +ERROR: Relation temp does not have attribute k QUERY: SELECT * FROM temp; initial|a|b|c|d|e|f|g|h|i|j|l|m|n|p|q|r|s|t|u|v|w|x|y|z -------+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+- diff --git a/src/test/regress/expected/oidint2-FreeBSD.out b/src/test/regress/expected/oidint2-FreeBSD.out deleted file mode 100644 index ce444dc184..0000000000 --- a/src/test/regress/expected/oidint2-FreeBSD.out +++ /dev/null @@ -1,66 +0,0 @@ -QUERY: CREATE TABLE OIDINT2_TBL(f1 oidint2); -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('1234/9873'); -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('1235/9873'); -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('987/-1234'); -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('123456'); -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('123456/123456'); -ERROR: pg_atoi: error reading "123456": Result too large -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES (''); -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('asdfasd'); -ERROR: pg_atoi: error in "asdfasd": can't parse "asdfasd" -QUERY: SELECT '' AS five, OIDINT2_TBL.*; -five|f1 -----+--------- - |1234/9873 - |1235/9873 - |987/-1234 - |123456/0 - |0/0 -(5 rows) - -QUERY: SELECT '' AS one, o.* FROM OIDINT2_TBL o WHERE o.f1 = '1235/9873'; -one|f1 ----+--------- - |1235/9873 -(1 row) - -QUERY: SELECT '' AS four, o.* FROM OIDINT2_TBL o WHERE o.f1 <> '1235/9873'; -four|f1 -----+--------- - |1234/9873 - |987/-1234 - |123456/0 - |0/0 -(4 rows) - -QUERY: SELECT '' AS four, o.* FROM OIDINT2_TBL o WHERE o.f1 <= '1235/9873'; -four|f1 -----+--------- - |1234/9873 - |1235/9873 - |987/-1234 - |0/0 -(4 rows) - -QUERY: SELECT '' AS three, o.* FROM OIDINT2_TBL o WHERE o.f1 < '1235/9873'; -three|f1 ------+--------- - |1234/9873 - |987/-1234 - |0/0 -(3 rows) - -QUERY: SELECT '' AS two, o.* FROM OIDINT2_TBL o WHERE o.f1 >= '1235/9873'; -two|f1 ----+--------- - |1235/9873 - |123456/0 -(2 rows) - -QUERY: SELECT '' AS one, o.* FROM OIDINT2_TBL o WHERE o.f1 > '1235/9873'; -one|f1 ----+-------- - |123456/0 -(1 row) - -QUERY: DROP TABLE OIDINT2_TBL; diff --git a/src/test/regress/expected/oidint2-NetBSD.out b/src/test/regress/expected/oidint2-NetBSD.out deleted file mode 100644 index ce444dc184..0000000000 --- a/src/test/regress/expected/oidint2-NetBSD.out +++ /dev/null @@ -1,66 +0,0 @@ -QUERY: CREATE TABLE OIDINT2_TBL(f1 oidint2); -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('1234/9873'); -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('1235/9873'); -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('987/-1234'); -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('123456'); -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('123456/123456'); -ERROR: pg_atoi: error reading "123456": Result too large -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES (''); -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('asdfasd'); -ERROR: pg_atoi: error in "asdfasd": can't parse "asdfasd" -QUERY: SELECT '' AS five, OIDINT2_TBL.*; -five|f1 -----+--------- - |1234/9873 - |1235/9873 - |987/-1234 - |123456/0 - |0/0 -(5 rows) - -QUERY: SELECT '' AS one, o.* FROM OIDINT2_TBL o WHERE o.f1 = '1235/9873'; -one|f1 ----+--------- - |1235/9873 -(1 row) - -QUERY: SELECT '' AS four, o.* FROM OIDINT2_TBL o WHERE o.f1 <> '1235/9873'; -four|f1 -----+--------- - |1234/9873 - |987/-1234 - |123456/0 - |0/0 -(4 rows) - -QUERY: SELECT '' AS four, o.* FROM OIDINT2_TBL o WHERE o.f1 <= '1235/9873'; -four|f1 -----+--------- - |1234/9873 - |1235/9873 - |987/-1234 - |0/0 -(4 rows) - -QUERY: SELECT '' AS three, o.* FROM OIDINT2_TBL o WHERE o.f1 < '1235/9873'; -three|f1 ------+--------- - |1234/9873 - |987/-1234 - |0/0 -(3 rows) - -QUERY: SELECT '' AS two, o.* FROM OIDINT2_TBL o WHERE o.f1 >= '1235/9873'; -two|f1 ----+--------- - |1235/9873 - |123456/0 -(2 rows) - -QUERY: SELECT '' AS one, o.* FROM OIDINT2_TBL o WHERE o.f1 > '1235/9873'; -one|f1 ----+-------- - |123456/0 -(1 row) - -QUERY: DROP TABLE OIDINT2_TBL; diff --git a/src/test/regress/expected/oidint2-SunOS.out b/src/test/regress/expected/oidint2-SunOS.out deleted file mode 100644 index ce444dc184..0000000000 --- a/src/test/regress/expected/oidint2-SunOS.out +++ /dev/null @@ -1,66 +0,0 @@ -QUERY: CREATE TABLE OIDINT2_TBL(f1 oidint2); -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('1234/9873'); -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('1235/9873'); -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('987/-1234'); -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('123456'); -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('123456/123456'); -ERROR: pg_atoi: error reading "123456": Result too large -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES (''); -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('asdfasd'); -ERROR: pg_atoi: error in "asdfasd": can't parse "asdfasd" -QUERY: SELECT '' AS five, OIDINT2_TBL.*; -five|f1 -----+--------- - |1234/9873 - |1235/9873 - |987/-1234 - |123456/0 - |0/0 -(5 rows) - -QUERY: SELECT '' AS one, o.* FROM OIDINT2_TBL o WHERE o.f1 = '1235/9873'; -one|f1 ----+--------- - |1235/9873 -(1 row) - -QUERY: SELECT '' AS four, o.* FROM OIDINT2_TBL o WHERE o.f1 <> '1235/9873'; -four|f1 -----+--------- - |1234/9873 - |987/-1234 - |123456/0 - |0/0 -(4 rows) - -QUERY: SELECT '' AS four, o.* FROM OIDINT2_TBL o WHERE o.f1 <= '1235/9873'; -four|f1 -----+--------- - |1234/9873 - |1235/9873 - |987/-1234 - |0/0 -(4 rows) - -QUERY: SELECT '' AS three, o.* FROM OIDINT2_TBL o WHERE o.f1 < '1235/9873'; -three|f1 ------+--------- - |1234/9873 - |987/-1234 - |0/0 -(3 rows) - -QUERY: SELECT '' AS two, o.* FROM OIDINT2_TBL o WHERE o.f1 >= '1235/9873'; -two|f1 ----+--------- - |1235/9873 - |123456/0 -(2 rows) - -QUERY: SELECT '' AS one, o.* FROM OIDINT2_TBL o WHERE o.f1 > '1235/9873'; -one|f1 ----+-------- - |123456/0 -(1 row) - -QUERY: DROP TABLE OIDINT2_TBL; diff --git a/src/test/regress/expected/oidint2.out b/src/test/regress/expected/oidint2.out deleted file mode 100644 index fb3972fd43..0000000000 --- a/src/test/regress/expected/oidint2.out +++ /dev/null @@ -1,66 +0,0 @@ -QUERY: CREATE TABLE OIDINT2_TBL(f1 oidint2); -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('1234/9873'); -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('1235/9873'); -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('987/-1234'); -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('123456'); -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('123456/123456'); -ERROR: pg_atoi: error reading "123456": Math result not representable -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES (''); -QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('asdfasd'); -ERROR: pg_atoi: error in "asdfasd": can't parse "asdfasd" -QUERY: SELECT '' AS five, OIDINT2_TBL.*; -five|f1 -----+--------- - |1234/9873 - |1235/9873 - |987/-1234 - |123456/0 - |0/0 -(5 rows) - -QUERY: SELECT '' AS one, o.* FROM OIDINT2_TBL o WHERE o.f1 = '1235/9873'; -one|f1 ----+--------- - |1235/9873 -(1 row) - -QUERY: SELECT '' AS four, o.* FROM OIDINT2_TBL o WHERE o.f1 <> '1235/9873'; -four|f1 -----+--------- - |1234/9873 - |987/-1234 - |123456/0 - |0/0 -(4 rows) - -QUERY: SELECT '' AS four, o.* FROM OIDINT2_TBL o WHERE o.f1 <= '1235/9873'; -four|f1 -----+--------- - |1234/9873 - |1235/9873 - |987/-1234 - |0/0 -(4 rows) - -QUERY: SELECT '' AS three, o.* FROM OIDINT2_TBL o WHERE o.f1 < '1235/9873'; -three|f1 ------+--------- - |1234/9873 - |987/-1234 - |0/0 -(3 rows) - -QUERY: SELECT '' AS two, o.* FROM OIDINT2_TBL o WHERE o.f1 >= '1235/9873'; -two|f1 ----+--------- - |1235/9873 - |123456/0 -(2 rows) - -QUERY: SELECT '' AS one, o.* FROM OIDINT2_TBL o WHERE o.f1 > '1235/9873'; -one|f1 ----+-------- - |123456/0 -(1 row) - -QUERY: DROP TABLE OIDINT2_TBL; diff --git a/src/test/regress/expected/oidint4-FreeBSD.out b/src/test/regress/expected/oidint4-FreeBSD.out deleted file mode 100644 index dd3008c81b..0000000000 --- a/src/test/regress/expected/oidint4-FreeBSD.out +++ /dev/null @@ -1,66 +0,0 @@ -QUERY: CREATE TABLE OIDINT4_TBL(f1 oidint4); -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('1234/9873'); -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('1235/9873'); -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('987/-1234'); -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('123456'); -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('123456/1234568901234567890'); -ERROR: pg_atoi: error reading "1234568901234567890": Result too large -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES (''); -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('asdfasd'); -ERROR: pg_atoi: error in "asdfasd": can't parse "asdfasd" -QUERY: SELECT '' AS five, OIDINT4_TBL.*; -five|f1 -----+--------- - |1234/9873 - |1235/9873 - |987/-1234 - |123456/0 - |0/0 -(5 rows) - -QUERY: SELECT '' AS one, o.* FROM OIDINT4_TBL o WHERE o.f1 = '1235/9873'; -one|f1 ----+--------- - |1235/9873 -(1 row) - -QUERY: SELECT '' AS four, o.* FROM OIDINT4_TBL o WHERE o.f1 <> '1235/9873'; -four|f1 -----+--------- - |1234/9873 - |987/-1234 - |123456/0 - |0/0 -(4 rows) - -QUERY: SELECT '' AS four, o.* FROM OIDINT4_TBL o WHERE o.f1 <= '1235/9873'; -four|f1 -----+--------- - |1234/9873 - |1235/9873 - |987/-1234 - |0/0 -(4 rows) - -QUERY: SELECT '' AS three, o.* FROM OIDINT4_TBL o WHERE o.f1 < '1235/9873'; -three|f1 ------+--------- - |1234/9873 - |987/-1234 - |0/0 -(3 rows) - -QUERY: SELECT '' AS two, o.* FROM OIDINT4_TBL o WHERE o.f1 >= '1235/9873'; -two|f1 ----+--------- - |1235/9873 - |123456/0 -(2 rows) - -QUERY: SELECT '' AS one, o.* FROM OIDINT4_TBL o WHERE o.f1 > '1235/9873'; -one|f1 ----+-------- - |123456/0 -(1 row) - -QUERY: DROP TABLE OIDINT4_TBL; diff --git a/src/test/regress/expected/oidint4-NetBSD.out b/src/test/regress/expected/oidint4-NetBSD.out deleted file mode 100644 index dd3008c81b..0000000000 --- a/src/test/regress/expected/oidint4-NetBSD.out +++ /dev/null @@ -1,66 +0,0 @@ -QUERY: CREATE TABLE OIDINT4_TBL(f1 oidint4); -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('1234/9873'); -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('1235/9873'); -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('987/-1234'); -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('123456'); -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('123456/1234568901234567890'); -ERROR: pg_atoi: error reading "1234568901234567890": Result too large -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES (''); -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('asdfasd'); -ERROR: pg_atoi: error in "asdfasd": can't parse "asdfasd" -QUERY: SELECT '' AS five, OIDINT4_TBL.*; -five|f1 -----+--------- - |1234/9873 - |1235/9873 - |987/-1234 - |123456/0 - |0/0 -(5 rows) - -QUERY: SELECT '' AS one, o.* FROM OIDINT4_TBL o WHERE o.f1 = '1235/9873'; -one|f1 ----+--------- - |1235/9873 -(1 row) - -QUERY: SELECT '' AS four, o.* FROM OIDINT4_TBL o WHERE o.f1 <> '1235/9873'; -four|f1 -----+--------- - |1234/9873 - |987/-1234 - |123456/0 - |0/0 -(4 rows) - -QUERY: SELECT '' AS four, o.* FROM OIDINT4_TBL o WHERE o.f1 <= '1235/9873'; -four|f1 -----+--------- - |1234/9873 - |1235/9873 - |987/-1234 - |0/0 -(4 rows) - -QUERY: SELECT '' AS three, o.* FROM OIDINT4_TBL o WHERE o.f1 < '1235/9873'; -three|f1 ------+--------- - |1234/9873 - |987/-1234 - |0/0 -(3 rows) - -QUERY: SELECT '' AS two, o.* FROM OIDINT4_TBL o WHERE o.f1 >= '1235/9873'; -two|f1 ----+--------- - |1235/9873 - |123456/0 -(2 rows) - -QUERY: SELECT '' AS one, o.* FROM OIDINT4_TBL o WHERE o.f1 > '1235/9873'; -one|f1 ----+-------- - |123456/0 -(1 row) - -QUERY: DROP TABLE OIDINT4_TBL; diff --git a/src/test/regress/expected/oidint4-SunOS.out b/src/test/regress/expected/oidint4-SunOS.out deleted file mode 100644 index dd3008c81b..0000000000 --- a/src/test/regress/expected/oidint4-SunOS.out +++ /dev/null @@ -1,66 +0,0 @@ -QUERY: CREATE TABLE OIDINT4_TBL(f1 oidint4); -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('1234/9873'); -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('1235/9873'); -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('987/-1234'); -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('123456'); -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('123456/1234568901234567890'); -ERROR: pg_atoi: error reading "1234568901234567890": Result too large -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES (''); -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('asdfasd'); -ERROR: pg_atoi: error in "asdfasd": can't parse "asdfasd" -QUERY: SELECT '' AS five, OIDINT4_TBL.*; -five|f1 -----+--------- - |1234/9873 - |1235/9873 - |987/-1234 - |123456/0 - |0/0 -(5 rows) - -QUERY: SELECT '' AS one, o.* FROM OIDINT4_TBL o WHERE o.f1 = '1235/9873'; -one|f1 ----+--------- - |1235/9873 -(1 row) - -QUERY: SELECT '' AS four, o.* FROM OIDINT4_TBL o WHERE o.f1 <> '1235/9873'; -four|f1 -----+--------- - |1234/9873 - |987/-1234 - |123456/0 - |0/0 -(4 rows) - -QUERY: SELECT '' AS four, o.* FROM OIDINT4_TBL o WHERE o.f1 <= '1235/9873'; -four|f1 -----+--------- - |1234/9873 - |1235/9873 - |987/-1234 - |0/0 -(4 rows) - -QUERY: SELECT '' AS three, o.* FROM OIDINT4_TBL o WHERE o.f1 < '1235/9873'; -three|f1 ------+--------- - |1234/9873 - |987/-1234 - |0/0 -(3 rows) - -QUERY: SELECT '' AS two, o.* FROM OIDINT4_TBL o WHERE o.f1 >= '1235/9873'; -two|f1 ----+--------- - |1235/9873 - |123456/0 -(2 rows) - -QUERY: SELECT '' AS one, o.* FROM OIDINT4_TBL o WHERE o.f1 > '1235/9873'; -one|f1 ----+-------- - |123456/0 -(1 row) - -QUERY: DROP TABLE OIDINT4_TBL; diff --git a/src/test/regress/expected/oidint4.out b/src/test/regress/expected/oidint4.out deleted file mode 100644 index b1df56b259..0000000000 --- a/src/test/regress/expected/oidint4.out +++ /dev/null @@ -1,66 +0,0 @@ -QUERY: CREATE TABLE OIDINT4_TBL(f1 oidint4); -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('1234/9873'); -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('1235/9873'); -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('987/-1234'); -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('123456'); -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('123456/1234568901234567890'); -ERROR: pg_atoi: error reading "1234568901234567890": Math result not representable -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES (''); -QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('asdfasd'); -ERROR: pg_atoi: error in "asdfasd": can't parse "asdfasd" -QUERY: SELECT '' AS five, OIDINT4_TBL.*; -five|f1 -----+--------- - |1234/9873 - |1235/9873 - |987/-1234 - |123456/0 - |0/0 -(5 rows) - -QUERY: SELECT '' AS one, o.* FROM OIDINT4_TBL o WHERE o.f1 = '1235/9873'; -one|f1 ----+--------- - |1235/9873 -(1 row) - -QUERY: SELECT '' AS four, o.* FROM OIDINT4_TBL o WHERE o.f1 <> '1235/9873'; -four|f1 -----+--------- - |1234/9873 - |987/-1234 - |123456/0 - |0/0 -(4 rows) - -QUERY: SELECT '' AS four, o.* FROM OIDINT4_TBL o WHERE o.f1 <= '1235/9873'; -four|f1 -----+--------- - |1234/9873 - |1235/9873 - |987/-1234 - |0/0 -(4 rows) - -QUERY: SELECT '' AS three, o.* FROM OIDINT4_TBL o WHERE o.f1 < '1235/9873'; -three|f1 ------+--------- - |1234/9873 - |987/-1234 - |0/0 -(3 rows) - -QUERY: SELECT '' AS two, o.* FROM OIDINT4_TBL o WHERE o.f1 >= '1235/9873'; -two|f1 ----+--------- - |1235/9873 - |123456/0 -(2 rows) - -QUERY: SELECT '' AS one, o.* FROM OIDINT4_TBL o WHERE o.f1 > '1235/9873'; -one|f1 ----+-------- - |123456/0 -(1 row) - -QUERY: DROP TABLE OIDINT4_TBL; diff --git a/src/test/regress/expected/oidname.out b/src/test/regress/expected/oidname.out deleted file mode 100644 index 4f8b7dadef..0000000000 --- a/src/test/regress/expected/oidname.out +++ /dev/null @@ -1,63 +0,0 @@ -QUERY: CREATE TABLE OIDNAME_TBL(f1 oidname); -QUERY: INSERT INTO OIDNAME_TBL(f1) VALUES ('1234,abcd'); -QUERY: INSERT INTO OIDNAME_TBL(f1) VALUES ('1235,efgh'); -QUERY: INSERT INTO OIDNAME_TBL(f1) VALUES ('987,XXXX'); -QUERY: INSERT INTO OIDNAME_TBL(f1) VALUES ('123456'); -ERROR: Bad input data for type oidname -QUERY: INSERT INTO OIDNAME_TBL(f1) VALUES ('123456,abcdefghijklmnopqrsutvwyz0123456789'); -QUERY: INSERT INTO OIDNAME_TBL(f1) VALUES (''); -ERROR: Bad input data for type oidname -QUERY: INSERT INTO OIDNAME_TBL(f1) VALUES ('asdfasd'); -ERROR: Bad input data for type oidname -QUERY: SELECT '' AS four, OIDNAME_TBL.*; -four|f1 -----+-------------------------------------- - |1234,abcd - |1235,efgh - |987,XXXX - |123456,abcdefghijklmnopqrsutvwyz012345 -(4 rows) - -QUERY: SELECT '' AS one, o.* FROM OIDNAME_TBL o WHERE o.f1 = '1234,abcd'; -one|f1 ----+--------- - |1234,abcd -(1 row) - -QUERY: SELECT '' AS three, o.* FROM OIDNAME_TBL o WHERE o.f1 <> '1234,abcd'; -three|f1 ------+-------------------------------------- - |1235,efgh - |987,XXXX - |123456,abcdefghijklmnopqrsutvwyz012345 -(3 rows) - -QUERY: SELECT '' AS two, o.* FROM OIDNAME_TBL o WHERE o.f1 <= '1234,abcd'; -two|f1 ----+--------- - |1234,abcd - |987,XXXX -(2 rows) - -QUERY: SELECT '' AS one, o.* FROM OIDNAME_TBL o WHERE o.f1 < '1234,abcd'; -one|f1 ----+-------- - |987,XXXX -(1 row) - -QUERY: SELECT '' AS three, o.* FROM OIDNAME_TBL o WHERE o.f1 >= '1234,abcd'; -three|f1 ------+-------------------------------------- - |1234,abcd - |1235,efgh - |123456,abcdefghijklmnopqrsutvwyz012345 -(3 rows) - -QUERY: SELECT '' AS two, o.* FROM OIDNAME_TBL o WHERE o.f1 > '1234,abcd'; -two|f1 ----+-------------------------------------- - |1235,efgh - |123456,abcdefghijklmnopqrsutvwyz012345 -(2 rows) - -QUERY: DROP TABLE OIDNAME_TBL; diff --git a/src/test/regress/sql/alter_table.sql b/src/test/regress/sql/alter_table.sql index 9764459922..5d1d773b05 100644 --- a/src/test/regress/sql/alter_table.sql +++ b/src/test/regress/sql/alter_table.sql @@ -44,9 +44,9 @@ ALTER TABLE temp ADD COLUMN t box; ALTER TABLE temp ADD COLUMN u tinterval; -ALTER TABLE temp ADD COLUMN v oidint4; +ALTER TABLE temp ADD COLUMN v datetime; -ALTER TABLE temp ADD COLUMN w oidname; +ALTER TABLE temp ADD COLUMN w timespan; ALTER TABLE temp ADD COLUMN x float8[]; @@ -113,9 +113,9 @@ ALTER TABLE temp ADD COLUMN t box; ALTER TABLE temp ADD COLUMN u tinterval; -ALTER TABLE temp ADD COLUMN v oidint4; +ALTER TABLE temp ADD COLUMN v datetime; -ALTER TABLE temp ADD COLUMN w oidname; +ALTER TABLE temp ADD COLUMN w timespan; ALTER TABLE temp ADD COLUMN x float8[]; diff --git a/src/test/regress/sql/oidint2.sql b/src/test/regress/sql/oidint2.sql deleted file mode 100644 index f1966844d2..0000000000 --- a/src/test/regress/sql/oidint2.sql +++ /dev/null @@ -1,47 +0,0 @@ --- *************testing built-in type oidint2 **************** --- oidint2 is a an adt for multiple key indices involving oid and int2 --- probably will not be used directly by most users - -CREATE TABLE OIDINT2_TBL(f1 oidint2); - -INSERT INTO OIDINT2_TBL(f1) VALUES ('1234/9873'); - -INSERT INTO OIDINT2_TBL(f1) VALUES ('1235/9873'); - -INSERT INTO OIDINT2_TBL(f1) VALUES ('987/-1234'); - --- no int2 component --- --- this is defined as good in the code -- I don't know what will break --- if we disallow it. --- -INSERT INTO OIDINT2_TBL(f1) VALUES ('123456'); - --- int2 component too large -INSERT INTO OIDINT2_TBL(f1) VALUES ('123456/123456'); - --- --- this is defined as good in the code -- I don't know what will break --- if we disallow it. --- -INSERT INTO OIDINT2_TBL(f1) VALUES (''); - --- bad inputs -INSERT INTO OIDINT2_TBL(f1) VALUES ('asdfasd'); - - -SELECT '' AS five, OIDINT2_TBL.*; - -SELECT '' AS one, o.* FROM OIDINT2_TBL o WHERE o.f1 = '1235/9873'; - -SELECT '' AS four, o.* FROM OIDINT2_TBL o WHERE o.f1 <> '1235/9873'; - -SELECT '' AS four, o.* FROM OIDINT2_TBL o WHERE o.f1 <= '1235/9873'; - -SELECT '' AS three, o.* FROM OIDINT2_TBL o WHERE o.f1 < '1235/9873'; - -SELECT '' AS two, o.* FROM OIDINT2_TBL o WHERE o.f1 >= '1235/9873'; - -SELECT '' AS one, o.* FROM OIDINT2_TBL o WHERE o.f1 > '1235/9873'; - -DROP TABLE OIDINT2_TBL; diff --git a/src/test/regress/sql/oidint4.sql b/src/test/regress/sql/oidint4.sql deleted file mode 100644 index 99549c99ca..0000000000 --- a/src/test/regress/sql/oidint4.sql +++ /dev/null @@ -1,46 +0,0 @@ ---*************testing built-in type oidint4 **************** --- oidint4 is a an adt for multiple key indices involving oid and int4 --- probably will not be used directly by most users - -CREATE TABLE OIDINT4_TBL(f1 oidint4); - -INSERT INTO OIDINT4_TBL(f1) VALUES ('1234/9873'); - -INSERT INTO OIDINT4_TBL(f1) VALUES ('1235/9873'); - -INSERT INTO OIDINT4_TBL(f1) VALUES ('987/-1234'); - --- no int4 component --- --- this is defined as good in the code -- I don't know what will break --- if we disallow it. --- -INSERT INTO OIDINT4_TBL(f1) VALUES ('123456'); - --- int4 component too large -INSERT INTO OIDINT4_TBL(f1) VALUES ('123456/1234568901234567890'); - --- --- this is defined as good in the code -- I don't know what will break --- if we disallow it. --- -INSERT INTO OIDINT4_TBL(f1) VALUES (''); - --- bad inputs -INSERT INTO OIDINT4_TBL(f1) VALUES ('asdfasd'); - -SELECT '' AS five, OIDINT4_TBL.*; - -SELECT '' AS one, o.* FROM OIDINT4_TBL o WHERE o.f1 = '1235/9873'; - -SELECT '' AS four, o.* FROM OIDINT4_TBL o WHERE o.f1 <> '1235/9873'; - -SELECT '' AS four, o.* FROM OIDINT4_TBL o WHERE o.f1 <= '1235/9873'; - -SELECT '' AS three, o.* FROM OIDINT4_TBL o WHERE o.f1 < '1235/9873'; - -SELECT '' AS two, o.* FROM OIDINT4_TBL o WHERE o.f1 >= '1235/9873'; - -SELECT '' AS one, o.* FROM OIDINT4_TBL o WHERE o.f1 > '1235/9873'; - -DROP TABLE OIDINT4_TBL; diff --git a/src/test/regress/sql/oidname.sql b/src/test/regress/sql/oidname.sql deleted file mode 100644 index d8d5522b65..0000000000 --- a/src/test/regress/sql/oidname.sql +++ /dev/null @@ -1,39 +0,0 @@ --- *************testing built-in type oidname **************** --- oidname is a an adt for multiple key indices involving oid and name --- probably will not be used directly by most users - -CREATE TABLE OIDNAME_TBL(f1 oidname); - -INSERT INTO OIDNAME_TBL(f1) VALUES ('1234,abcd'); - -INSERT INTO OIDNAME_TBL(f1) VALUES ('1235,efgh'); - -INSERT INTO OIDNAME_TBL(f1) VALUES ('987,XXXX'); - --- no name component -INSERT INTO OIDNAME_TBL(f1) VALUES ('123456'); - --- name component too long -INSERT INTO OIDNAME_TBL(f1) VALUES ('123456,abcdefghijklmnopqrsutvwyz0123456789'); - --- bad inputs -INSERT INTO OIDNAME_TBL(f1) VALUES (''); - -INSERT INTO OIDNAME_TBL(f1) VALUES ('asdfasd'); - - -SELECT '' AS four, OIDNAME_TBL.*; - -SELECT '' AS one, o.* FROM OIDNAME_TBL o WHERE o.f1 = '1234,abcd'; - -SELECT '' AS three, o.* FROM OIDNAME_TBL o WHERE o.f1 <> '1234,abcd'; - -SELECT '' AS two, o.* FROM OIDNAME_TBL o WHERE o.f1 <= '1234,abcd'; - -SELECT '' AS one, o.* FROM OIDNAME_TBL o WHERE o.f1 < '1234,abcd'; - -SELECT '' AS three, o.* FROM OIDNAME_TBL o WHERE o.f1 >= '1234,abcd'; - -SELECT '' AS two, o.* FROM OIDNAME_TBL o WHERE o.f1 > '1234,abcd'; - -DROP TABLE OIDNAME_TBL; diff --git a/src/test/regress/sql/tests b/src/test/regress/sql/tests index d1631d5fff..e8446796ad 100644 --- a/src/test/regress/sql/tests +++ b/src/test/regress/sql/tests @@ -8,9 +8,6 @@ int2 int4 int8 oid -oidint2 -oidint4 -oidname float4 float8 numerology