database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-05 23:56:58 +03:00
Code

Simplify handling of second database for dblink tests.

Browse Source
This commit is contained in:
Tom Lane 2002-09-14 22:00:59 +00:00
parent b66ba36be9
commit cd7a3b6c0d
2 changed files with 43 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
contrib/dblink/expected/dblink.out
View File

@ -1,10 +1,30 @@
-- --
-- First, create a slave database and define the functions. -- First, create a slave database and define the functions and test data
-- Turn off echoing so that expected file does not depend on -- therein.
-- contents of dblink.sql.
-- --
-- This initial hackery is to allow successive runs without failures.
--
CREATE OR REPLACE FUNCTION conditional_drop() RETURNS text AS '
DECLARE
dbname text;
BEGIN
SELECT INTO dbname datname FROM pg_database WHERE datname = ''regression_slave'';
IF FOUND THEN
DROP DATABASE regression_slave;
END IF;
RETURN ''OK'';
END;
' LANGUAGE 'plpgsql';
SELECT conditional_drop();
conditional_drop
------------------
OK
(1 row)
CREATE DATABASE regression_slave; CREATE DATABASE regression_slave;
\connect regression_slave \connect regression_slave
-- Turn off echoing so that expected file does not depend on
-- contents of dblink.sql.
\set ECHO none \set ECHO none
create table foo(f1 int, f2 text, f3 text[], primary key (f1,f2)); create table foo(f1 int, f2 text, f3 text[], primary key (f1,f2));
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'foo_pkey' for table 'foo' NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'foo_pkey' for table 'foo'
@ -219,41 +239,3 @@ select dblink_disconnect();
OK OK
(1 row) (1 row)
-- now wait for the connection to the slave to be cleared before
-- we try to drop the database
CREATE FUNCTION wait() RETURNS TEXT AS '
DECLARE
rec record;
cntr int;
BEGIN
cntr = 0;
select into rec d.datname
from pg_database d,
(select pg_stat_get_backend_dbid(pg_stat_get_backend_idset()) AS dbid) b
where d.oid = b.dbid and d.datname = ''regression_slave'';
WHILE FOUND LOOP
cntr = cntr + 1;
select into rec d.datname
from pg_database d,
(select pg_stat_get_backend_dbid(pg_stat_get_backend_idset()) AS dbid) b
where d.oid = b.dbid and d.datname = ''regression_slave'';
-- safety valve
if cntr > 1000 THEN
EXIT;
end if;
END LOOP;
RETURN ''OK'';
END;
' LANGUAGE 'plpgsql';
SELECT wait();
wait
------
OK
(1 row)
-- OK, safe to drop the slave
DROP DATABASE regression_slave;

58
contrib/dblink/sql/dblink.sql
View File

@ -1,10 +1,27 @@
-- --
-- First, create a slave database and define the functions. -- First, create a slave database and define the functions and test data
-- Turn off echoing so that expected file does not depend on -- therein.
-- contents of dblink.sql.
-- --
-- This initial hackery is to allow successive runs without failures.
--
CREATE OR REPLACE FUNCTION conditional_drop() RETURNS text AS '
DECLARE
dbname text;
BEGIN
SELECT INTO dbname datname FROM pg_database WHERE datname = ''regression_slave'';
IF FOUND THEN
DROP DATABASE regression_slave;
END IF;
RETURN ''OK'';
END;
' LANGUAGE 'plpgsql';
SELECT conditional_drop();
CREATE DATABASE regression_slave; CREATE DATABASE regression_slave;
\connect regression_slave \connect regression_slave
-- Turn off echoing so that expected file does not depend on
-- contents of dblink.sql.
\set ECHO none \set ECHO none
\i dblink.sql \i dblink.sql
\set ECHO all \set ECHO all
@ -112,38 +129,3 @@ select * from dblink('select * from foo') as t(a int, b text, c text[]) where a
-- close the persistent connection -- close the persistent connection
select dblink_disconnect(); select dblink_disconnect();
-- now wait for the connection to the slave to be cleared before
-- we try to drop the database
CREATE FUNCTION wait() RETURNS TEXT AS '
DECLARE
rec record;
cntr int;
BEGIN
cntr = 0;
select into rec d.datname
from pg_database d,
(select pg_stat_get_backend_dbid(pg_stat_get_backend_idset()) AS dbid) b
where d.oid = b.dbid and d.datname = ''regression_slave'';
WHILE FOUND LOOP
cntr = cntr + 1;
select into rec d.datname
from pg_database d,
(select pg_stat_get_backend_dbid(pg_stat_get_backend_idset()) AS dbid) b
where d.oid = b.dbid and d.datname = ''regression_slave'';
-- safety valve
if cntr > 1000 THEN
EXIT;
end if;
END LOOP;
RETURN ''OK'';
END;
' LANGUAGE 'plpgsql';
SELECT wait();
-- OK, safe to drop the slave
DROP DATABASE regression_slave;