Remove not-really-standard implementation of CREATE TABLE's UNDER clause,

and revert documentation to describe the existing INHERITS clause
instead, per recent discussion in pghackers.  Also fix implementation
of SQL_inheritance SET variable: it is not cool to look at this var
during the initial parsing phase, only during parse_analyze().  See
recent bug report concerning misinterpretation of date constants just
after a SET TIMEZONE command.  gram.y really has to be an invariant
transformation of the query string to a raw parsetree; anything that
can vary with time must be done during parse analysis.

2 files changed, 6 insertions, 6 deletions

diff --git a/src/test/regress/expected/inherit.out b/src/test/regress/expected/inherit.out
index b0eed9a09e9..3bc4199e118 100644
--- a/src/test/regress/expected/inherit.out
+++ b/src/test/regress/expected/inherit.out
@@ -2,9 +2,9 @@
 -- Test inheritance features
 --
 CREATE TABLE a (aa TEXT);
-CREATE TABLE b UNDER a (bb TEXT);
-CREATE TABLE c UNDER a (cc TEXT);
-CREATE TABLE d UNDER b,c,a (dd TEXT);
+CREATE TABLE b (bb TEXT) INHERITS (a);
+CREATE TABLE c (cc TEXT) INHERITS (a);
+CREATE TABLE d (dd TEXT) INHERITS (b,c,a);
 INSERT INTO a(aa) VALUES('aaa');
 INSERT INTO a(aa) VALUES('aaaa');
 INSERT INTO a(aa) VALUES('aaaaa');
diff --git a/src/test/regress/sql/inherit.sql b/src/test/regress/sql/inherit.sql
index e1fde48222a..c60a89266ae 100644
--- a/src/test/regress/sql/inherit.sql
+++ b/src/test/regress/sql/inherit.sql
@@ -2,9 +2,9 @@
 -- Test inheritance features
 --
 CREATE TABLE a (aa TEXT);
-CREATE TABLE b UNDER a (bb TEXT);
-CREATE TABLE c UNDER a (cc TEXT);
-CREATE TABLE d UNDER b,c,a (dd TEXT);
+CREATE TABLE b (bb TEXT) INHERITS (a);
+CREATE TABLE c (cc TEXT) INHERITS (a);
+CREATE TABLE d (dd TEXT) INHERITS (b,c,a);
 
 INSERT INTO a(aa) VALUES('aaa');
 INSERT INTO a(aa) VALUES('aaaa');