From: Marko Kreen <markokr@gmail.com>
Date: Wed, 14 Sep 2011 10:01:24 +0000 (+0300)
Subject: regtests@9.1: ignore errors around 'create language plpgsql'
X-Git-Tag: plproxy_2_3~7
X-Git-Url: http://git.postgresql.org/gitweb/edit?a=commitdiff_plain;h=ab275f029e8ab0242ff5a17583b848911502eef0;p=plproxy.git

regtests@9.1: ignore errors around 'create language plpgsql'

As of 9.1, there is no clean way to get plpgsql into db
that works across versions.
---

diff --git a/expected/plproxy_encoding.out b/expected/plproxy_encoding.out
index 0d0ea12..31939ed 100644
--- a/expected/plproxy_encoding.out
+++ b/expected/plproxy_encoding.out
@@ -16,10 +16,10 @@ create database test_enc_proxy with encoding 'euc_jp' template template0;
 create database test_enc_part with encoding 'utf-8' template template0;
 -- initialize proxy db
 \c test_enc_proxy
-set client_min_messages = 'warning';
 set client_encoding = 'utf-8';
-drop language if exists plpgsql;
+set client_min_messages = 'fatal';
 create language plpgsql;
+set client_min_messages = 'warning';
 \set ECHO none
 create schema plproxy;
 create or replace function plproxy.get_cluster_version(cluster_name text)
@@ -43,9 +43,9 @@ create function test_encoding3(text) returns setof intl_data as $$
 $$ language plproxy;
 -- initialize part db
 \c test_enc_part
-set client_min_messages = 'warning';
-drop language if exists plpgsql;
+set client_min_messages = 'fatal';
 create language plpgsql;
+set client_min_messages = 'warning';
 set client_encoding = 'utf8';
 create table intl_data (id int4, "コラム" text);
 insert into intl_data values (1, 'リモートデータ');
@@ -122,9 +122,9 @@ create database test_enc_proxy with encoding 'utf-8' template template0;
 create database test_enc_part with encoding 'euc_jp' template template0;
 -- initialize proxy db
 \c test_enc_proxy
-set client_min_messages = 'warning';
-drop language if exists plpgsql;
+set client_min_messages = 'fatal';
 create language plpgsql;
+set client_min_messages = 'warning';
 \set ECHO none
 set client_encoding = 'utf8';
 create schema plproxy;
@@ -149,9 +149,9 @@ create function test_encoding3(text) returns setof intl_data as $$
 $$ language plproxy;
 -- initialize part db
 \c test_enc_part
-set client_min_messages = 'warning';
-drop language if exists plpgsql;
+set client_min_messages = 'fatal';
 create language plpgsql;
+set client_min_messages = 'warning';
 set client_encoding = 'utf8';
 create table intl_data (id int4, "コラム" text);
 insert into intl_data values (1, 'リモートデータ');
diff --git a/sql/plproxy_encoding.sql b/sql/plproxy_encoding.sql
index b3b9609..1da4d40 100644
--- a/sql/plproxy_encoding.sql
+++ b/sql/plproxy_encoding.sql
@@ -22,10 +22,10 @@ create database test_enc_part with encoding 'utf-8' template template0;
 
 -- initialize proxy db
 \c test_enc_proxy
-set client_min_messages = 'warning';
 set client_encoding = 'utf-8';
-drop language if exists plpgsql;
+set client_min_messages = 'fatal';
 create language plpgsql;
+set client_min_messages = 'warning';
 \set ECHO none
 \i plproxy.sql
 \set ECHO all
@@ -52,9 +52,9 @@ create function test_encoding3(text) returns setof intl_data as $$
 $$ language plproxy;
 -- initialize part db
 \c test_enc_part
-set client_min_messages = 'warning';
-drop language if exists plpgsql;
+set client_min_messages = 'fatal';
 create language plpgsql;
+set client_min_messages = 'warning';
 set client_encoding = 'utf8';
 create table intl_data (id int4, "コラム" text);
 insert into intl_data values (1, 'リモートデータ');
@@ -94,9 +94,9 @@ create database test_enc_part with encoding 'euc_jp' template template0;
 
 -- initialize proxy db
 \c test_enc_proxy
-set client_min_messages = 'warning';
-drop language if exists plpgsql;
+set client_min_messages = 'fatal';
 create language plpgsql;
+set client_min_messages = 'warning';
 \set ECHO none
 \i plproxy.sql
 \set ECHO all
@@ -125,9 +125,9 @@ $$ language plproxy;
 
 -- initialize part db
 \c test_enc_part
-set client_min_messages = 'warning';
-drop language if exists plpgsql;
+set client_min_messages = 'fatal';
 create language plpgsql;
+set client_min_messages = 'warning';
 set client_encoding = 'utf8';
 create table intl_data (id int4, "コラム" text);
 insert into intl_data values (1, 'リモートデータ');
diff --git a/sql/plproxy_init.sql b/sql/plproxy_init.sql
index c8d55aa..12390e4 100644
--- a/sql/plproxy_init.sql
+++ b/sql/plproxy_init.sql
@@ -5,8 +5,9 @@ set client_min_messages = 'warning';
 
 \i plproxy.sql
 
-drop language if exists plpgsql;
+set client_min_messages = 'fatal';
 create language plpgsql;
+set client_min_messages = 'warning';
 
 -- create cluster info functions
 create schema plproxy;
@@ -65,24 +66,17 @@ drop database if exists test_enc_proxy;
 drop database if exists test_enc_part;
 
 \c test_part
-set client_min_messages = 'warning';
-drop language if exists plpgsql;
+set client_min_messages = 'fatal';
 create language plpgsql;
-set client_min_messages = 'warning';
 \c test_part0
-set client_min_messages = 'warning';
-drop language if exists plpgsql;
+set client_min_messages = 'fatal';
 create language plpgsql;
 \c test_part1
-set client_min_messages = 'warning';
-drop language if exists plpgsql;
+set client_min_messages = 'fatal';
 create language plpgsql;
 \c test_part2
-set client_min_messages = 'warning';
-drop language if exists plpgsql;
+set client_min_messages = 'fatal';
 create language plpgsql;
 \c test_part3
-set client_min_messages = 'warning';
-drop language if exists plpgsql;
+set client_min_messages = 'fatal';
 create language plpgsql;
-