Skip to content

Commit e3e2bf8

Browse files
3nidsm-kuhn
authored andcommittedSep 15, 2017
fix psql
1 parent 168e37b commit e3e2bf8

File tree

7 files changed

+16
-15
lines changed

7 files changed

+16
-15
lines changed
 

‎.ci/travis/linux/docker-build-test.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ ccache -z
99

1010
cd /root/QGIS
1111

12-
sleep 20
13-
1412
printf "[qgis_test]\nhost=postgres\nport=5432\ndbname=docker\nuser=docker\npassword=docker" > ~/.pg_service.conf
1513
export PGUSER=docker
1614
export PGHOST=postgres

‎tests/testdata/provider/testdata_pg.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/bin/sh
22

3+
set -e
4+
35
SCRIPTS="
46
tests/testdata/provider/testdata_pg.sql
57
tests/testdata/provider/testdata_pg_reltests.sql
@@ -12,5 +14,5 @@ SCRIPTS="
1214
dropdb qgis_test 2> /dev/null || true
1315
createdb qgis_test || exit 1
1416
for f in ${SCRIPTS}; do
15-
psql -q -f $f qgis_test --set ON_ERROR_STOP=1 || exit 1
17+
psql --echo-errors -f $f qgis_test -v ON_ERROR_STOP=1
1618
done

‎tests/testdata/provider/testdata_pg.sql

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
--
1+
2+
--
23
-- PostgreSQL database dump
34
--
45

@@ -30,7 +31,7 @@ SET default_with_oids = false;
3031

3132
--
3233
-- TOC entry 171 (class 1259 OID 377761)
33-
-- Name: someData; Type: TABLE; Schema: qgis_test; Owner: postgres; Tablespace:
34+
-- Name: someData; Type: TABLE; Schema: qgis_test; Owner: postgres; Tablespace:
3435
--
3536

3637
CREATE TABLE qgis_test."someData" (
@@ -97,7 +98,7 @@ INSERT INTO qgis_test."someDataCompound" ( key1, key2, pk, cnt, name, name2, num
9798

9899
--
99100
-- TOC entry 3953 (class 2606 OID 377768)
100-
-- Name: someData_pkey; Type: CONSTRAINT; Schema: qgis_test; Owner: postgres; Tablespace:
101+
-- Name: someData_pkey; Type: CONSTRAINT; Schema: qgis_test; Owner: postgres; Tablespace:
101102
--
102103

103104
ALTER TABLE ONLY qgis_test."someData"

‎tests/testdata/provider/testdata_pg_array.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
DROP TABLE IF EXISTS qgis_test.string_array;
1+
2+
DROP TABLE IF EXISTS qgis_test.string_array;
23

34
CREATE TABLE qgis_test.string_array
45
(
@@ -34,4 +35,3 @@ CREATE TABLE qgis_test.double_array
3435
INSERT INTO qgis_test.double_array(value)
3536
VALUES
3637
('{1.1,2,-5.12345}');
37-

‎tests/testdata/provider/testdata_pg_hstore.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
CREATE EXTENSION IF NOT EXISTS hstore;
1+
2+
CREATE EXTENSION IF NOT EXISTS hstore;
23

34
DROP TABLE IF EXISTS qgis_test.dict;
45

‎tests/testdata/provider/testdata_pg_reltests.sql

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
-- Table: qgis_test.authors
1+
2+
-- Table: qgis_test.authors
23

34
DROP TABLE IF EXISTS qgis_test.books_authors;
45
DROP TABLE IF EXISTS qgis_test.authors;
@@ -40,7 +41,7 @@ CREATE TABLE qgis_test.books_authors
4041
);
4142

4243
INSERT INTO qgis_test.authors(name)
43-
VALUES
44+
VALUES
4445
('Erich Gamma'),
4546
('Richard Helm'),
4647
('Ralph Johnson'),
@@ -50,11 +51,11 @@ INSERT INTO qgis_test.authors(name)
5051
('Gabriel García Márquez');
5152

5253
INSERT INTO qgis_test.books(name)
53-
VALUES
54+
VALUES
5455
('Design Patterns. Elements of Reusable Object-Oriented Software');
5556

5657
INSERT INTO qgis_test.books_authors(fk_book, fk_author)
57-
VALUES
58+
VALUES
5859
(1, 1),
5960
(1, 2),
6061
(1, 3),

‎tests/testdata/provider/testdata_pg_vectorjoin.sql

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
--CREATE SCHEMA IF NOT EXISTS qgis_test;
32

43

@@ -34,4 +33,3 @@ CREATE TABLE qgis_test.table_x
3433
value_x2 integer,
3534
CONSTRAINT table_x_pkey PRIMARY KEY (id_x)
3635
);
37-

0 commit comments

Comments
 (0)
Please sign in to comment.