Skip to content

Commit 0f8c33f

Browse files
committed
Don't use a generic 'unpackaged' version
The behaviour of the script is not really predictable if it is run on the loose objects of pg_reorg >= 1.1.8. So let's be explicit about what version we expect as starting point.
1 parent bd06ec0 commit 0f8c33f

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

lib/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
/.deps/
22
/pg_reorg.sql
33
/pg_reorg--[0-9.]*.sql
4-
/pg_reorg--unpackaged--[0-9.]*.sql

lib/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ EXTVER = $(shell grep -e '^default_version' $(EXTENSION).control \
1717

1818
#supports both EXTENSION (for >=9.1) and without_EXTENSION (for <PG 9.1)
1919
DATA_built = pg_reorg.sql pg_reorg--$(EXTVER).sql
20-
DATA = pg_reorg--unpackaged--1.1.8.sql uninstall_pg_reorg.sql
20+
DATA = pg_reorg--1.1.7--1.1.8.sql uninstall_pg_reorg.sql
2121

2222
ifndef USE_PGXS
2323
top_builddir = ../../..

lib/pg_reorg--unpackaged--1.1.8.sql renamed to lib/pg_reorg--1.1.7--1.1.8.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
/* pg_reorg/pg_reorg--unpackaged--1.1.8.sql */
1+
/* Create the pg_reorg extension from a loose set of objects */
22

33
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
4-
\echo Use "CREATE EXTENSION pg_reorg FROM unpackaged" to load this file. \quit
4+
\echo Use "CREATE EXTENSION pg_reorg FROM 1.1.7" to load this file. \quit
55

66
ALTER EXTENSION pg_reorg ADD FUNCTION reorg.version();
77
ALTER EXTENSION pg_reorg ADD AGGREGATE reorg.array_accum(anyelement);

0 commit comments

Comments
 (0)