Update /contrib for "autocommit TO 'on'".

Create objects in public schema.

Make spacing/capitalization consistent.

Remove transaction block use for object creation.

Remove unneeded function GRANTs.

5 files changed, 48 insertions, 35 deletions

diff --git a/contrib/spi/autoinc.sql.in b/contrib/spi/autoinc.sql.in
index 172fdd74b25..cec50b61895 100644
--- a/contrib/spi/autoinc.sql.in
+++ b/contrib/spi/autoinc.sql.in
@@ -1,6 +1,9 @@
-DROP FUNCTION autoinc();
+-- Adjust this setting to control where the objects get created.
+SET search_path = public;
 
-CREATE FUNCTION autoinc() 
-	RETURNS trigger 
-	AS 'MODULE_PATHNAME'
-	LANGUAGE 'C';
+SET autocommit TO 'on';
+
+CREATE OR REPLACE FUNCTION autoinc() 
+RETURNS trigger 
+AS 'MODULE_PATHNAME'
+LANGUAGE 'C';
diff --git a/contrib/spi/insert_username.sql.in b/contrib/spi/insert_username.sql.in
index b7689a4321c..c8c67665799 100644
--- a/contrib/spi/insert_username.sql.in
+++ b/contrib/spi/insert_username.sql.in
@@ -1,6 +1,9 @@
-DROP FUNCTION insert_username();
+-- Adjust this setting to control where the objects get created.
+SET search_path = public;
 
-CREATE FUNCTION insert_username() 
-	RETURNS trigger 
-	AS 'MODULE_PATHNAME'
-	LANGUAGE 'C';
+SET autocommit TO 'on';
+
+CREATE OR REPLACE FUNCTION insert_username() 
+RETURNS trigger 
+AS 'MODULE_PATHNAME'
+LANGUAGE 'C';
diff --git a/contrib/spi/moddatetime.sql.in b/contrib/spi/moddatetime.sql.in
index 07208787a66..e89c37e6d52 100644
--- a/contrib/spi/moddatetime.sql.in
+++ b/contrib/spi/moddatetime.sql.in
@@ -1,6 +1,9 @@
-DROP FUNCTION moddatetime();
+-- Adjust this setting to control where the objects get created.
+SET search_path = public;
 
-CREATE FUNCTION moddatetime() 
-	RETURNS trigger 
-	AS 'MODULE_PATHNAME'
-	LANGUAGE 'C';
+SET autocommit TO 'on';
+
+CREATE OR REPLACE FUNCTION moddatetime()
+RETURNS trigger
+AS 'MODULE_PATHNAME'
+LANGUAGE 'C';
diff --git a/contrib/spi/refint.sql.in b/contrib/spi/refint.sql.in
index 688d2abd447..322de9521e5 100644
--- a/contrib/spi/refint.sql.in
+++ b/contrib/spi/refint.sql.in
@@ -1,12 +1,14 @@
-DROP FUNCTION check_primary_key ();
-DROP FUNCTION check_foreign_key ();
+-- Adjust this setting to control where the objects get created.
+SET search_path = public;
 
-CREATE FUNCTION check_primary_key ()
-	RETURNS trigger
-	AS 'MODULE_PATHNAME'
-	LANGUAGE 'C';
+SET autocommit TO 'on';
 
-CREATE FUNCTION check_foreign_key ()
-	RETURNS trigger
-	AS 'MODULE_PATHNAME'
-	LANGUAGE 'C';
+CREATE OR REPLACE FUNCTION check_primary_key()
+RETURNS trigger
+AS 'MODULE_PATHNAME'
+LANGUAGE 'C';
+
+CREATE OR REPLACE FUNCTION check_foreign_key()
+RETURNS trigger
+AS 'MODULE_PATHNAME'
+LANGUAGE 'C';
diff --git a/contrib/spi/timetravel.sql.in b/contrib/spi/timetravel.sql.in
index f519b93de1f..b297a23ec27 100644
--- a/contrib/spi/timetravel.sql.in
+++ b/contrib/spi/timetravel.sql.in
@@ -1,12 +1,14 @@
-DROP FUNCTION timetravel();
-DROP FUNCTION set_timetravel(name, int4);
+-- Adjust this setting to control where the objects get created.
+SET search_path = public;
 
-CREATE FUNCTION timetravel() 
-	RETURNS trigger 
-	AS 'MODULE_PATHNAME'
-	LANGUAGE 'C';
+SET autocommit TO 'on';
 
-CREATE FUNCTION set_timetravel(name, int4) 
-	RETURNS int4 
-	AS 'MODULE_PATHNAME'
-	LANGUAGE 'C' WITH (isStrict);
+CREATE OR REPLACE FUNCTION timetravel() 
+RETURNS trigger 
+AS 'MODULE_PATHNAME'
+LANGUAGE 'C';
+
+CREATE OR REPLACE FUNCTION set_timetravel(name, int4) 
+RETURNS int4 
+AS 'MODULE_PATHNAME'
+LANGUAGE 'C' WITH (isStrict);