add sql regression tests

Author: kelvich

Cluster.pm

@@ -30,6 +30,7 @@ sub init
 	{
 		$node->init(allows_streaming => 'logical');
 		$node->append_conf('postgresql.conf', q{
+			unix_socket_directories = ''
 			listen_addresses = '127.0.0.1'
 			max_connections = 50
 

Makefile

@@ -7,20 +7,16 @@ src/pglogical_relid_map.o src/ddd.o src/bkb.o src/spill.o src/state.o \
 src/resolver.o src/ddl.o src/syncpoint.o
 MODULE_big = multimaster
 
-ifdef USE_PGXS
-PG_CPPFLAGS += -I$(CURDIR)/src/include
-else
-PG_CPPFLAGS += -I$(top_srcdir)/$(subdir)/src/include
-endif
-
 PG_CPPFLAGS += -I$(libpq_srcdir)
 SHLIB_LINK = $(libpq)
 
 ifdef USE_PGXS
+PG_CPPFLAGS += -I$(CURDIR)/src/include
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 else
+PG_CPPFLAGS += -I$(top_srcdir)/$(subdir)/src/include
 subdir = contrib/mmts
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
@@ -54,7 +50,7 @@ stop:
 		PG_REGRESS='$(CURDIR)/$(top_builddir)/src/test/regress/pg_regress' \
 		perl run.pl --stop
 
-regress: submake-regress
+regress-pg: submake-regress
 	cd $(CURDIR)/$(top_builddir)/src/test/regress && \
 	$(with_temp_install) \
 	PGPORT='6$(DEF_PGPORT)' \
@@ -64,4 +60,15 @@ regress: submake-regress
 	--bindir='' \
 	--use-existing \
 	--schedule=serial_schedule \
-	--dlpath=$(CURDIR)/$(top_builddir)/src/test/regress
+	--dlpath=$(CURDIR)/$(top_builddir)/src/test/regress
+
+run-regress:
+	$(with_temp_install) \
+	PGPORT='6$(DEF_PGPORT)' \
+	PGHOST='127.0.0.1' \
+	$(top_builddir)/src/test/regress/pg_regress \
+	--use-existing \
+	--bindir= \
+	$(pg_regress_locale_flags) multimaster
+
+regress: | start run-regress stop

run.pl

@@ -10,6 +10,7 @@
 if ($action eq "--start")
 {
 	$PostgresNode::last_port_assigned = 65431;
+	$PostgresNode::test_pghost = "127.0.0.1";
 
 	my $cluster = new Cluster($n_nodes);
 	$cluster->init();

sql/multimaster.sql

@@ -1,3 +1,8 @@
+-- set connection strings to nodes
+select conninfo as node1 from mtm.nodes() where id = 1 \gset
+select conninfo as node2 from mtm.nodes() where id = 2 \gset
+select conninfo as node3 from mtm.nodes() where id = 3 \gset
+
 
 -- check that implicit empty transactions works fine
 create table t (a int, b text);
@@ -10,35 +15,114 @@ copy t from stdout;
 
 
 -- test mixed temp table and persistent write
-
 create table t_tempddl_mix(id int primary key);
 insert into t_tempddl_mix values(1);
 begin;
 insert into t_tempddl_mix values(42);
 create temp table tempddl(id int);
 commit;
-table t;
 
-\c "dbname=regression port=64717 host=127.0.0.1"
 table t;
 
+\c :node2
+table t;
 
 -- test CTA replication inside explain
-
 EXPLAIN ANALYZE create table explain_cta as select 42;
 
-
-
---- xx?
-
+--- test schemas
 create user user1;
 create schema user1;
 alter schema user1 owner to user1;
 
-\c "user=user1 dbname=regression"
+\c :node1
 create table user1.test(i int primary key);
 create table user1.test2(i int primary key);
 
-\c "user=user1 dbname=regression port=5433"
-select * from test;
+\c :node3
+table test;
+
+\c :node1
+
+
+--- scheduler example with secdefs and triggers
+CREATE TABLE aaa (
+    id   int primary key,
+    text text
+);
+CREATE TABLE aaa_copy (LIKE aaa);
+ALTER  TABLE aaa_copy ADD submit_time timestamp NOT NULL DEFAULT now();
+ALTER  TABLE aaa_copy ADD submitter text NOT NULL DEFAULT session_user;
+ALTER  TABLE aaa_copy ADD version_id SERIAL NOT NULL;
+ALTER  TABLE aaa_copy ADD PRIMARY KEY (id, version_id);
+
+CREATE FUNCTION add_aaa(
+  aid   integer
+) RETURNS integer AS
+$BODY$
+DECLARE
+  nid integer;
+BEGIN
+  INSERT INTO aaa (id, text) VALUES (aid, 'zzz') RETURNING id INTO nid;
+  RETURN nid;
+END
+$BODY$
+LANGUAGE plpgsql SECURITY DEFINER;
+
+CREATE FUNCTION drop_aaa(
+  aid   integer
+) RETURNS integer AS
+$BODY$
+BEGIN
+  DELETE FROM aaa WHERE id = aid;
+  RETURN aid;
+END
+$BODY$
+LANGUAGE plpgsql SECURITY DEFINER;
+
+CREATE OR REPLACE FUNCTION on_aaa_update() RETURNS TRIGGER
+AS $BODY$
+DECLARE
+  aaa_id integer;
+BEGIN
+  aaa_id := NEW.id;
+  INSERT INTO aaa_copy VALUES (NEW.*);
+  IF TG_OP = 'UPDATE' THEN
+    INSERT INTO aaa_copy VALUES (NEW.*);
+  END IF;
+  RETURN OLD;
+END
+$BODY$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION on_aaa_delete() RETURNS TRIGGER
+AS $BODY$
+DECLARE
+  aaa_id INTEGER;
+BEGIN
+  aaa_id := OLD.id;
+  DELETE FROM aaa_copy WHERE id = aaa_id;
+  RETURN OLD;
+END
+$BODY$ LANGUAGE plpgsql;
+
+CREATE TRIGGER aaa_update_trigger
+AFTER UPDATE OR INSERT ON aaa
+  FOR EACH ROW EXECUTE PROCEDURE on_aaa_update();
+
+CREATE TRIGGER aaa_delete_trigger
+BEFORE DELETE ON aaa
+  FOR EACH ROW EXECUTE PROCEDURE on_aaa_delete();
+
+select add_aaa(58);
+select add_aaa(5833);
+select add_aaa(582);
+
+delete from aaa;
+
+table aaa;
+table aaa_copy;
+
+\c :node3
 
+table aaa;
+table aaa_copy;