Merge branch 'PGPRO9_5' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into PGPRO9_5

vbwagner · vbwagner · commit 72b4f2af1d7e · 2016-05-04T16:52:24.000+03:00
diff --git a/src/pgpro-upgrade/README b/src/pgpro-upgrade/README
@@ -36,7 +36,7 @@ feature.
 Both files should have same base name and one — extension .test and
 other .sql
 
-1. Script with .sql extension contains usial create commands which would
+1. Script with .sql extension contains usual create commands which would
 create neccessary database object(s).
 
 2. Script with .text extension should contain single select query,
diff --git a/src/pgpro-upgrade/pgpro_upgrade b/src/pgpro-upgrade/pgpro_upgrade
@@ -52,5 +52,3 @@ for i in "$DIR"/*.test; do
 		done
 	fi
 done
-			
-
diff --git a/src/pgpro-upgrade/pgpro_version.sql b/src/pgpro-upgrade/pgpro_version.sql
@@ -1 +1 @@
-CREATE FUNCTION pgpro_version() RETURNS TEXT AS 'pgpro_version' LANGUAGE internal STRICT IMMUTABLE;
+CREATE FUNCTION pg_catalog.pgpro_version() RETURNS TEXT AS 'pgpro_version' LANGUAGE internal STRICT IMMUTABLE;
diff --git a/src/pgpro-upgrade/pgpro_version.test b/src/pgpro-upgrade/pgpro_version.test
@@ -1 +1 @@
-select count(*) > 0 as pgpro_version from pg_proc where  proname = 'pgpro_version';
+SELECT COUNT(*) > 0 AS pgpro_version FROM pg_proc WHERE proname = 'pgpro_version' AND pronamespace = 11;

-Original file line number
+Diff line change
 		done
 	fi
 done
+-
+-
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-CREATE FUNCTION pgpro_version() RETURNS TEXT AS 'pgpro_version' LANGUAGE internal STRICT IMMUTABLE;`
	`1`	`+CREATE FUNCTION pg_catalog.pgpro_version() RETURNS TEXT AS 'pgpro_version' LANGUAGE internal STRICT IMMUTABLE;`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-select count(*) > 0 as pgpro_version from pg_proc where proname = 'pgpro_version';`
	`1`	`+SELECT COUNT(*) > 0 AS pgpro_version FROM pg_proc WHERE proname = 'pgpro_version' AND pronamespace = 11;`