Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update 8.3 patch.

Turns out it applies cleanly for the core and schema files, too, so remove the stuff to work around those issues.
  • Loading branch information...
commit 5951e4dc2895aa047bd85e558a828a62cacb8673 1 parent bab5ce5
@theory authored
Showing with 9 additions and 11 deletions.
  1. +2 −4 Makefile
  2. +7 −7 compat/install-8.3.patch
View
6 Makefile
@@ -117,19 +117,17 @@ endif
sql/pgtap-core.sql: sql/pgtap.sql.in
cp $< $@
- sed -e 's,sql/pgtap,sql/pgtap-core,g' compat/install-8.3.patch | patch -s -p0
+ sed -e 's,sql/pgtap,sql/pgtap-core,g' compat/install-8.3.patch | patch -p0
sed -e 's,MODULE_PATHNAME,$$libdir/pgtap,g' -e 's,__OS__,$(OSNAME),g' -e 's,__VERSION__,$(NUMVERSION),g' sql/pgtap-core.sql > sql/pgtap-core.tmp
$(PERL) compat/gencore 0 sql/pgtap-core.tmp > sql/pgtap-core.sql
rm sql/pgtap-core.tmp
- rm sql/pgtap-core.sql.orig
sql/pgtap-schema.sql: sql/pgtap.sql.in
cp $< $@
- sed -e 's,sql/pgtap,sql/pgtap-schema,g' compat/install-8.3.patch | patch -s -p0
+ sed -e 's,sql/pgtap,sql/pgtap-schema,g' compat/install-8.3.patch | patch -p0
sed -e 's,MODULE_PATHNAME,$$libdir/pgtap,g' -e 's,__OS__,$(OSNAME),g' -e 's,__VERSION__,$(NUMVERSION),g' sql/pgtap-schema.sql > sql/pgtap-schema.tmp
$(PERL) compat/gencore 1 sql/pgtap-schema.tmp > sql/pgtap-schema.sql
rm sql/pgtap-schema.tmp
- rm sql/pgtap-schema.sql.orig
# Make sure that we build the regression tests.
installcheck: test/setup.sql
View
14 compat/install-8.3.patch
@@ -1,6 +1,6 @@
---- sql/pgtap.sql.saf 2011-11-10 14:58:17.000000000 -0800
-+++ sql/pgtap.sql 2011-11-10 14:59:43.000000000 -0800
-@@ -12,6 +12,11 @@
+--- sql/pgtap.sql.saf 2012-09-10 16:57:28.000000000 -0700
++++ sql/pgtap.sql 2012-09-10 16:57:48.000000000 -0700
+@@ -9,6 +9,11 @@
RETURNS text AS 'SELECT current_setting(''server_version'')'
LANGUAGE SQL IMMUTABLE;
@@ -12,7 +12,7 @@
CREATE OR REPLACE FUNCTION pg_version_num()
RETURNS integer AS $$
SELECT s.a[1]::int * 10000
-@@ -6244,7 +6249,7 @@
+@@ -6254,7 +6259,7 @@
FETCH want INTO want_rec;
want_found := FOUND;
WHILE have_found OR want_found LOOP
@@ -21,7 +21,7 @@
RETURN ok( false, $3 ) || E'\n' || diag(
' Results differ beginning at row ' || rownum || E':\n' ||
' have: ' || CASE WHEN have_found THEN have_rec::text ELSE 'NULL' END || E'\n' ||
-@@ -6399,7 +6404,7 @@
+@@ -6409,7 +6414,7 @@
FETCH want INTO want_rec;
want_found := FOUND;
WHILE have_found OR want_found LOOP
@@ -30,7 +30,7 @@
RETURN ok( true, $3 );
ELSE
FETCH have INTO have_rec;
-@@ -6585,13 +6590,7 @@
+@@ -6595,13 +6600,7 @@
$$ LANGUAGE sql;
-- collect_tap( tap, tap, tap )
@@ -45,7 +45,7 @@
RETURNS TEXT AS $$
SELECT array_to_string($1, E'\n');
$$ LANGUAGE sql;
-@@ -7063,7 +7062,7 @@
+@@ -7073,7 +7072,7 @@
rec RECORD;
BEGIN
EXECUTE _query($1) INTO rec;
Please sign in to comment.
Something went wrong with that request. Please try again.