fix tests for version 19

test/Makefile.in

@@ -33,9 +33,9 @@ installcheck: all odbc.ini reset-db runsuite
 # If the perl 'prove' test running utility is available, use it. It produces
 # nice output. But otherwise just run the plain suite, it's usable as is too.
 ifdef PROVE
-	prove -e ./runsuite $(TESTNAMES) :: --inputdir=$(origdir)
+	prove -e ./runsuite $(TESTNAMES) :: --inputdir=$(origdir) $(if $(server_version),--server-version=$(server_version))
 else
-	./runsuite $(TESTNAMES) --inputdir=$(origdir)
+	./runsuite $(TESTNAMES) --inputdir=$(origdir) $(if $(server_version),--server-version=$(server_version))
 endif
 
 override CFLAGS += -Wno-pointer-sign $(CFLAGS_ADD)

test/expected/v19/error-rollback.out

@@ -0,0 +1,58 @@
+Test for rollback protocol 0
+connected
+Executing query that will succeed
+Executing query that will fail
+Failed to execute statement
+22P02=ERROR: invalid input syntax for type integer: "fail1";
+Error while executing the query
+Rolling back with SQLEndTran
+Executing query that will succeed
+Result set:
+1
+disconnecting
+Test for rollback protocol 1
+connected
+Executing query that will succeed
+Executing query that will fail
+Failed to execute statement
+22P02=ERROR: invalid input syntax for type integer: "fail1";
+Error while executing the query
+Executing query that will succeed
+Result set:
+1
+disconnecting
+Test for rollback protocol 2
+connected
+Executing query that will succeed
+Executing query that will succeed
+Executing query that will fail
+Failed to execute statement
+22P02=ERROR: invalid input syntax for type integer: "fail-1";
+Error while executing the query
+Executing query that will succeed
+Executing query that will succeed
+Executing query that will fail
+Failed to execute statement
+22P02=ERROR: invalid input syntax for type integer: "fail-1";
+Error while executing the query
+Executing query that will fail
+Failed to execute statement
+22P02=ERROR: invalid input syntax for type integer: "fail-1";
+Error while executing the query
+Executing query that will succeed
+Executing procedure call that will fail
+Failed to execute procedure call
+42883=ERROR: function invalidfunction() does not exist
+DETAIL: There is no function of that name.;
+Error while executing the query
+Executing query that will succeed
+Executing query that will succeed
+Result set:
+1
+2
+3
+4
+5
+6
+7
+disconnecting

test/expected/v19/quotes.out

@@ -0,0 +1,34 @@
+connected
+
+SET standard_conforming_strings=on
+Executing: SELECT 'foo', ?::text with param: param'quote
+Result set:
+foo	param'quote
+Executing: SELECT 'foo', ?::text with param: param\backslash
+Result set:
+foo	param\backslash
+Executing: SELECT 'foo', ?::text with param: ends with backslash\
+Result set:
+foo	ends with backslash\
+Executing: SELECT 'doubled '' quotes', ?::text with param: param
+Result set:
+doubled ' quotes	param
+Executing: SELECT E'escaped quote\' here', ?::text with param: param
+Result set:
+escaped quote' here	param
+Executing: SELECT $$dollar quoted string$$, ?::text with param: param
+Result set:
+dollar quoted string	param
+Executing: SELECT $xx$complex $dollar quotes$xx$, ?::text with param: param
+Result set:
+complex $dollar quotes	param
+Executing: SELECT $dollar$morecomplex $dollar quotes$dollar$, ?::text with param: param
+Result set:
+morecomplex $dollar quotes	param
+Executing: SELECT ?::text, '1' a$1 with param: $ in an identifier
+Result set:
+$ in an identifier	1
+Executing: SELECT '1'::text a$$S1,?::text,$$2 $'s in an identifier$$::text with param: param
+Result set:
+1	param	2 $'s in an identifier
+disconnecting