Revert unnecessary changes.

diff --git a/src/backend/commands/foreigncmds.c b/src/backend/commands/foreigncmds.c
index f5741467fee8db81f1329ff8ee84be452128116f..926e00711ff855c989c76e33d34055f1c6b41fd0 100644 (file)
--- a/src/backend/commands/foreigncmds.c
+++ b/src/backend/commands/foreigncmds.c
@@ -459,7 +459,7 @@ CreateForeignDataWrapper(CreateFdwStmt *stmt)
 
    heap_freetuple(tuple);
 
-   if (fdwvalidator != InvalidOid)
+   if (fdwvalidator)
    {
        ObjectAddress myself;
        ObjectAddress referenced;

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 824e004cb8528fee8a29bd250e1928aa3c27155e..4b5c80185224cc4703440997cd23e08c93502231 100644 (file)
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -3295,7 +3295,6 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap, LOCKMODE lockmode)
    BulkInsertState bistate;
    int         hi_options;
 
-
    /*
     * Open the relation(s).  We have surely already locked the existing
     * table.

diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index a9be4b21ad6fdeba725f8b97eca1f9bde395a622..b7b722a98138dc30b44454ab3bf0b691150195c8 100644 (file)
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -1254,7 +1254,6 @@ describeOneTableDetails(const char *schemaname,
                      "\n   FROM pg_catalog.pg_attrdef d"
                      "\n   WHERE d.adrelid = a.attrelid AND d.adnum = a.attnum AND a.atthasdef),"
                      "\n  a.attnotnull, a.attnum");
-
    if (tableinfo.relkind == 'i')
        appendPQExpBuffer(&buf, ",\n  pg_catalog.pg_get_indexdef(a.attrelid, a.attnum, TRUE) AS indexdef");
    if (verbose)

diff --git a/src/test/regress/expected/foreign_data.out b/src/test/regress/expected/foreign_data.out
index 95c35aa2591ffa4306dcb1bedb15bc66fc79414f..d6d1858068c97fc307235f889b735773e524adba 100644 (file)
--- a/src/test/regress/expected/foreign_data.out
+++ b/src/test/regress/expected/foreign_data.out
@@ -1169,11 +1169,11 @@ DETAIL:  privileges for foreign-data wrapper postgresql
 REVOKE ALL ON FOREIGN DATA WRAPPER postgresql FROM unprivileged_role;
 DROP ROLE unprivileged_role;
 DROP ROLE regress_test_role2;
+DROP FOREIGN DATA WRAPPER postgresql CASCADE;
 DROP FOREIGN DATA WRAPPER dummy CASCADE;
 NOTICE:  drop cascades to 2 other objects
 DETAIL:  drop cascades to server sc
 drop cascades to user mapping for public
-DROP FOREIGN DATA WRAPPER postgresql CASCADE;
 \c
 DROP ROLE foreign_data_user;
 -- At this point we should have no wrappers, no servers, and no mappings.

diff --git a/src/test/regress/sql/foreign_data.sql b/src/test/regress/sql/foreign_data.sql
index f71139fc8d4a70bbcd485ac475aea24f0a24f3cb..9f5c85f20f810d97c425da8e12d2ebbda630f0bf 100644 (file)
--- a/src/test/regress/sql/foreign_data.sql
+++ b/src/test/regress/sql/foreign_data.sql
@@ -472,8 +472,8 @@ DROP ROLE unprivileged_role;                                -- ERROR
 REVOKE ALL ON FOREIGN DATA WRAPPER postgresql FROM unprivileged_role;
 DROP ROLE unprivileged_role;
 DROP ROLE regress_test_role2;
-DROP FOREIGN DATA WRAPPER dummy CASCADE;
 DROP FOREIGN DATA WRAPPER postgresql CASCADE;
+DROP FOREIGN DATA WRAPPER dummy CASCADE;
 \c
 DROP ROLE foreign_data_user;