Merge branch 'decibel:master' into ci

Author: jnasbyupgrade

sql/test_factory.sql

@@ -1,4 +1,5 @@
 CREATE TEMP TABLE original_role ON COMMIT DROP AS SELECT current_user AS original_role;
+
 GRANT SELECT ON pg_temp.original_role TO public;
 DO $body$
 BEGIN

sql/test_factory_pgtap.sql

@@ -35,4 +35,6 @@ BEGIN
 END
 $body$;
 
+DROP TABLE pg_temp.original_role;
+
 -- vi: expandtab ts=2 sw=2

test/deps.sql

@@ -0,0 +1,15 @@
+-- IF NOT EXISTS will emit NOTICEs, which is annoying
+SET client_min_messages = WARNING;
+
+-- Add any test dependency statements here
+-- Note: pgTap is loaded by setup.sql
+--CREATE EXTENSION IF NOT EXISTS ...;
+/*
+ * Now load our extension. We don't use IF NOT EXISTs here because we want an
+ * error if the extension is already loaded (because we want to ensure we're
+ * getting the very latest version).
+ */
+CREATE EXTENSION ...;
+
+-- Re-enable notices
+SET client_min_messages = NOTICE;

test/expected/install.out

@@ -0,0 +1,9 @@
+\set ECHO none
+ok 1 - drop extension test_factory_pgtap
+ok 2 - drop extension test_factory
+ok 3 - Extension test_factory should not exist
+ok 4 - Extension test_factory_pgtap should not exist
+ok 5 - create extension
+ok 6 - Function tf.tap(text, text) should exist
+ok 7 - clean-up test_factory_pgtap
+ok 8 - clean-up test_factory

test/helpers/tap_setup.sql

@@ -1,10 +1,14 @@
 \i test/helpers/psql.sql
 
-CREATE SCHEMA tap;
+/*
+ * NOTE: if you get errors about things already existing it's because they've
+ * been left behind by test/sql/install.sql
+ */
+SET client_min_messages = WARNING;
+CREATE SCHEMA IF NOT EXISTS tap;
 SET search_path = tap;
 CREATE EXTENSION IF NOT EXISTS pgtap SCHEMA tap;
---\i test/helpers/pgtap-core.sql
---\i test/helpers/pgtap-schema.sql
+SET client_min_messages = NOTICE;
 
 \pset format unaligned
 \pset tuples_only true

test/pgxntool

@@ -0,0 +1 @@
+../pgxntool/test/pgxntool

test/sql/install.sql

@@ -0,0 +1,30 @@
+\set ECHO none
+\i test/helpers/setup.sql
+
+SET client_min_messages = WARNING;
+
+/*
+ * DO NOT use CASCADE here; we want this to fail if there's anything installed
+ * that depends on it.
+ */
+SELECT lives_ok($$DROP EXTENSION IF EXISTS test_factory_pgtap$$, 'drop extension test_factory_pgtap');
+SELECT lives_ok($$DROP EXTENSION IF EXISTS test_factory$$, 'drop extension test_factory');
+
+SELECT hasnt_extension( 'test_factory' );
+SELECT hasnt_extension( 'test_factory_pgtap' );
+
+SELECT lives_ok($$CREATE EXTENSION test_factory_pgtap CASCADE$$, 'create extension');
+COMMIT;
+
+SELECT has_function('tf', 'tap', array['text','text']);
+
+-- Cleanup
+SELECT lives_ok($$DROP EXTENSION IF EXISTS test_factory_pgtap$$, 'clean-up test_factory_pgtap');
+SELECT lives_ok($$DROP EXTENSION IF EXISTS test_factory$$, 'clean-up test_factory');
+
+/*
+ * Arguably we should cleanup pgtap and the tap schema...
+ */
+
+-- vi: expandtab ts=2 sw=2
+