From 69cc976b3963e61be4929a92198741a966598172 Mon Sep 17 00:00:00 2001 From: Masahiko Sakamoto Date: Thu, 20 Sep 2012 15:36:47 +0000 Subject: [PATCH] Updated regression tests to use CREATE EXTENSION for PostgreSQL 9.1 or higher. --- bin/Makefile | 30 ++++++++++++++++++++++++++- bin/sql/init-extension.sql | 5 +++++ bin/sql/{init.sql => init-legacy.sql} | 0 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 bin/sql/init-extension.sql rename bin/sql/{init.sql => init-legacy.sql} (100%) mode change 100755 => 100644 diff --git a/bin/Makefile b/bin/Makefile index 8d22c9d..9d456c9 100755 --- a/bin/Makefile +++ b/bin/Makefile @@ -1,7 +1,7 @@ # # pg_reorg: bin/Makefile # -# Portions Copyright (c) 2008-2011, NIPPON TELEGRAPH AND TELEPHONE CORPORATION +# Portions Copyright (c) 2008-2012, NIPPON TELEGRAPH AND TELEPHONE CORPORATION # Portions Copyright (c) 2011, Itagaki Takahiro # SRCS = pg_reorg.c pgut/pgut.c pgut/pgut-fe.c @@ -37,3 +37,31 @@ endif # remove dependency to libxml2 and libxslt LIBS := $(filter-out -lxml2, $(LIBS)) LIBS := $(filter-out -lxslt, $(LIBS)) + +ifndef MAJORVERSION +MAJORVERSION := $(basename $(VERSION)) +endif + +sql/init.sql: sql/init-$(MAJORVERSION).sql + cp sql/init-$(MAJORVERSION).sql sql/init.sql +expected/init.out: expected/init-$(MAJORVERSION).out + cp expected/init-$(MAJORVERSION).out expected/init.out +sql/init-8.3.sql: + cp sql/init-legacy.sql sql/init-8.3.sql +sql/init-8.4.sql: + cp sql/init-legacy.sql sql/init-8.4.sql +sql/init-9.0.sql: + cp sql/init-legacy.sql sql/init-9.0.sql +sql/init-9.1.sql: + cp sql/init-extension.sql sql/init-9.1.sql +sql/init-9.2.sql: + cp sql/init-extension.sql sql/init-9.2.sql +sql/init-9.3.sql: + cp sql/init-extension.sql sql/init-9.3.sql + +.PHONY: subclean +clean: subclean +subclean: + rm -f sql/init.sql sql/init-{8.3,8.4,9.0,9.1,9.2,9.3}.sql + +installcheck: sql/init.sql diff --git a/bin/sql/init-extension.sql b/bin/sql/init-extension.sql new file mode 100644 index 0000000..5f37a49 --- /dev/null +++ b/bin/sql/init-extension.sql @@ -0,0 +1,5 @@ +SET client_min_messages = warning; +\set ECHO none +CREATE EXTENSION pg_reorg; +\set ECHO all +RESET client_min_messages; diff --git a/bin/sql/init.sql b/bin/sql/init-legacy.sql old mode 100755 new mode 100644 similarity index 100% rename from bin/sql/init.sql rename to bin/sql/init-legacy.sql