From 3a30b7dfcf39751215df39a556b3d4deadceda08 Mon Sep 17 00:00:00 2001 From: Craig Ringer Date: Tue, 21 Apr 2015 18:37:44 +0800 Subject: [PATCH] Fix tests broken by d7efbe8 and incorrect relation name --- expected/upgrade.out | 12 +++++++++++- extsql/bdr--0.10.0.0--0.10.0.1.sql | 4 +++- sql/upgrade.sql | 6 ++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/expected/upgrade.out b/expected/upgrade.out index de2283efe4..a47770ebfd 100644 --- a/expected/upgrade.out +++ b/expected/upgrade.out @@ -35,6 +35,8 @@ CREATE EXTENSION bdr VERSION '0.9.0.4'; DROP EXTENSION bdr; CREATE EXTENSION bdr VERSION '0.10.0.0'; DROP EXTENSION bdr; +CREATE EXTENSION bdr VERSION '0.10.0.1'; +DROP EXTENSION bdr; -- evolve version one by one from the oldest to the newest one CREATE EXTENSION bdr VERSION '0.8.0'; ALTER EXTENSION bdr UPDATE TO '0.8.0.1'; @@ -50,8 +52,16 @@ ALTER EXTENSION bdr UPDATE TO '0.9.0.2'; ALTER EXTENSION bdr UPDATE TO '0.9.0.3'; ALTER EXTENSION bdr UPDATE TO '0.9.0.4'; ALTER EXTENSION bdr UPDATE TO '0.10.0.0'; +ALTER EXTENSION bdr UPDATE TO '0.10.0.1'; -- Should never have to do anything: You missed adding the new version above. ALTER EXTENSION bdr UPDATE; -NOTICE: version "0.10.0.0" of extension "bdr" is already installed +NOTICE: version "0.10.0.1" of extension "bdr" is already installed +\dx bdr + List of installed extensions + Name | Version | Schema | Description +------+----------+------------+------------------------------------------- + bdr | 0.10.0.1 | pg_catalog | Bi-directional replication for PostgreSQL +(1 row) + \c postgres DROP DATABASE extension_upgrade; diff --git a/extsql/bdr--0.10.0.0--0.10.0.1.sql b/extsql/bdr--0.10.0.0--0.10.0.1.sql index 2588014367..baa7405345 100644 --- a/extsql/bdr--0.10.0.0--0.10.0.1.sql +++ b/extsql/bdr--0.10.0.0--0.10.0.1.sql @@ -28,6 +28,7 @@ BEGIN JOIN pg_namespace n ON n.oid = c.relnamespace WHERE c.relname = 'bdr_nodes_node_name' AND n.nspname = 'bdr' + AND c.relkind = 'i' ) THEN -- make sure node names are unique, renaming as few nodes as possible WITH nodes_to_rename AS ( @@ -52,8 +53,9 @@ BEGIN -- add constrains ensuring node_names are unique and not null ALTER TABLE bdr.bdr_nodes ALTER COLUMN node_name SET NOT NULL; + CREATE UNIQUE INDEX bdr_nodes_node_name - ON bdr.bdr_nodes_node_name(node_name); + ON bdr.bdr_nodes(node_name); END IF; END;$$; diff --git a/sql/upgrade.sql b/sql/upgrade.sql index b3a195fec1..d00672eed6 100644 --- a/sql/upgrade.sql +++ b/sql/upgrade.sql @@ -51,6 +51,9 @@ DROP EXTENSION bdr; CREATE EXTENSION bdr VERSION '0.10.0.0'; DROP EXTENSION bdr; +CREATE EXTENSION bdr VERSION '0.10.0.1'; +DROP EXTENSION bdr; + -- evolve version one by one from the oldest to the newest one CREATE EXTENSION bdr VERSION '0.8.0'; ALTER EXTENSION bdr UPDATE TO '0.8.0.1'; @@ -66,10 +69,13 @@ ALTER EXTENSION bdr UPDATE TO '0.9.0.2'; ALTER EXTENSION bdr UPDATE TO '0.9.0.3'; ALTER EXTENSION bdr UPDATE TO '0.9.0.4'; ALTER EXTENSION bdr UPDATE TO '0.10.0.0'; +ALTER EXTENSION bdr UPDATE TO '0.10.0.1'; -- Should never have to do anything: You missed adding the new version above. ALTER EXTENSION bdr UPDATE; +\dx bdr + \c postgres DROP DATABASE extension_upgrade; -- 2.39.5