Add regression tests for per-column generic options.

diff --git a/src/test/regress/expected/foreign_data.out b/src/test/regress/expected/foreign_data.out
index d513bf8b15c1a6d6c19180586f858ff402e0e434..2325253096e9e44f27eb72cb78ef733e11e7a23b 100644 (file)
--- a/src/test/regress/expected/foreign_data.out
+++ b/src/test/regress/expected/foreign_data.out
@@ -646,8 +646,8 @@ ERROR:  syntax error at or near "WITH OIDS"
 LINE 1: CREATE FOREIGN TABLE ft1 () SERVER sc WITH OIDS;
                                               ^
 CREATE FOREIGN TABLE ft1 (
-   c1 integer NOT NULL,
-   c2 text,
+   c1 integer OPTIONS (param1 'val1') NOT NULL,
+   c2 text OPTIONS (param2 'val2', param3 'val3'),
    c3 date
 ) SERVER sc OPTIONS (delimiter ',', quote '"');
 COMMENT ON FOREIGN TABLE ft1 IS 'ft1';
@@ -705,10 +705,10 @@ ALTER FOREIGN TABLE ft1 ALTER COLUMN c7 OPTIONS (ADD p1 'v1', ADD p2 'v2'),
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 OPTIONS (SET p2 'V2', DROP p1);
 \dec+
       List of foreign table columns
- Schema | Table | Column |    Options    
---------+-------+--------+---------------
- public | ft1   | c1     | 
- public | ft1   | c2     | 
+ Schema | Table | Column |          Options          
+--------+-------+--------+---------------------------
+ public | ft1   | c1     | {param1=val1}
+ public | ft1   | c2     | {param2=val2,param3=val3}
  public | ft1   | c3     | 
  public | ft1   | c4     | 
  public | ft1   | c6     | 

diff --git a/src/test/regress/sql/foreign_data.sql b/src/test/regress/sql/foreign_data.sql
index cafc23092949e240685f91ffde95173994e82c54..6241062f8bb3495b35ddd37b4e9fbadd5349142f 100644 (file)
--- a/src/test/regress/sql/foreign_data.sql
+++ b/src/test/regress/sql/foreign_data.sql
@@ -264,8 +264,8 @@ CREATE FOREIGN TABLE ft1 () SERVER no_server;                   -- ERROR
 CREATE FOREIGN TABLE ft1 (c1 serial) SERVER sc;                 -- ERROR
 CREATE FOREIGN TABLE ft1 () SERVER sc WITH OIDS;                -- ERROR
 CREATE FOREIGN TABLE ft1 (
-   c1 integer NOT NULL,
-   c2 text,
+   c1 integer OPTIONS (param1 'val1') NOT NULL,
+   c2 text OPTIONS (param2 'val2', param3 'val3'),
    c3 date
 ) SERVER sc OPTIONS (delimiter ',', quote '"');
 COMMENT ON FOREIGN TABLE ft1 IS 'ft1';