From 034b5c0be5703e1e039476ba0b4932cc1da7db23 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Wed, 17 Feb 2016 16:28:20 +0100 Subject: [PATCH] Make PG initialization scripts work with PostgreSQL 9.1 - Remove lock_timeout setting See https://travis-ci.org/qgis/QGIS/jobs/109844438#L942 - Remove CREATE SCHEMA IF NOT EXISTS See https://travis-ci.org/qgis/QGIS/jobs/109891682#L1016 --- tests/testdata/provider/testdata_pg.sql | 2 +- tests/testdata/provider/testdata_pg_vectorjoin.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/testdata/provider/testdata_pg.sql b/tests/testdata/provider/testdata_pg.sql index 20a6f4b2e35..645686b6b90 100644 --- a/tests/testdata/provider/testdata_pg.sql +++ b/tests/testdata/provider/testdata_pg.sql @@ -7,7 +7,7 @@ -- Started on 2015-05-21 09:37:33 CEST SET statement_timeout = 0; -SET lock_timeout = 0; +-- SET lock_timeout = 0; SET client_encoding = 'UTF8'; SET standard_conforming_strings = on; SET check_function_bodies = false; diff --git a/tests/testdata/provider/testdata_pg_vectorjoin.sql b/tests/testdata/provider/testdata_pg_vectorjoin.sql index 913b6b3bd64..156e6b89b7f 100644 --- a/tests/testdata/provider/testdata_pg_vectorjoin.sql +++ b/tests/testdata/provider/testdata_pg_vectorjoin.sql @@ -1,5 +1,5 @@  -CREATE SCHEMA IF NOT EXISTS qgis_test; +--CREATE SCHEMA IF NOT EXISTS qgis_test; DROP TABLE IF EXISTS qgis_test.table_a;