Skip to content

Commit 6698fb8

Browse files
3nids3nids
authoredFeb 11, 2018
Merge pull request #6310 from 3nids/pd_domain_218
[postgres] fix domain not in public schema
·
final-2_18_28final-2_18_17
2 parents c34f23c + 42dd971 commit 6698fb8

File tree

5 files changed

+92
-3
lines changed

5 files changed

+92
-3
lines changed
 

‎src/providers/postgres/qgspostgresprovider.cpp

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1582,6 +1582,9 @@ void QgsPostgresProvider::enumValues( int index, QStringList& enumList )
15821582
QString fieldName = mAttributeFields.at( index ).name();
15831583
QString typeName = mAttributeFields.at( index ).typeName();
15841584

1585+
// Remove schema extension from typeName
1586+
typeName.remove( QRegExp( "^([^.]+\\.)+" ) );
1587+
15851588
//is type an enum?
15861589
QString typeSql = QString( "SELECT typtype FROM pg_type WHERE typname=%1" ).arg( quotedValue( typeName ) );
15871590
QgsPostgresResult typeRes( connectionRO()->PQexec( typeSql ) );
@@ -1634,12 +1637,22 @@ bool QgsPostgresProvider::parseDomainCheckConstraint( QStringList& enumValues, c
16341637
enumValues.clear();
16351638

16361639
//is it a domain type with a check constraint?
1637-
QString domainSql = QString( "SELECT domain_name FROM information_schema.columns WHERE table_name=%1 AND column_name=%2" ).arg( quotedValue( mTableName ), quotedValue( attributeName ) );
1640+
QString domainSql = QString( "SELECT domain_name, domain_schema FROM information_schema.columns WHERE table_name=%1 AND column_name=%2" ).arg( quotedValue( mTableName ), quotedValue( attributeName ) );
16381641
QgsPostgresResult domainResult( connectionRO()->PQexec( domainSql ) );
1639-
if ( domainResult.PQresultStatus() == PGRES_TUPLES_OK && domainResult.PQntuples() > 0 )
1642+
if ( domainResult.PQresultStatus() == PGRES_TUPLES_OK && domainResult.PQntuples() > 0 && !domainResult.PQgetvalue( 0, 0 ).isNull() )
16401643
{
16411644
//a domain type
1642-
QString domainCheckDefinitionSql = QString( "SELECT consrc FROM pg_constraint WHERE conname=(SELECT constraint_name FROM information_schema.domain_constraints WHERE domain_name=%1)" ).arg( quotedValue( domainResult.PQgetvalue( 0, 0 ) ) );
1645+
QString domainCheckDefinitionSql = QString( ""
1646+
"SELECT consrc FROM pg_constraint "
1647+
" WHERE contypid =("
1648+
" SELECT oid FROM pg_type "
1649+
" WHERE typname = %1 "
1650+
" AND typnamespace =("
1651+
" SELECT oid FROM pg_namespace WHERE nspname = %2"
1652+
" )"
1653+
" )" )
1654+
.arg( quotedValue( domainResult.PQgetvalue( 0, 0 ) ) )
1655+
.arg( quotedValue( domainResult.PQgetvalue( 0, 1 ) ) );
16431656
QgsPostgresResult domainCheckRes( connectionRO()->PQexec( domainCheckDefinitionSql ) );
16441657
if ( domainCheckRes.PQresultStatus() == PGRES_TUPLES_OK && domainCheckRes.PQntuples() > 0 )
16451658
{

‎tests/src/python/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ ADD_PYTHON_TEST(PyQgsPalLabelingComposer test_qgspallabeling_composer.py)
7474
ADD_PYTHON_TEST(PyQgsPalLabelingPlacement test_qgspallabeling_placement.py)
7575
ADD_PYTHON_TEST(PyQgsPanelWidget test_qgspanelwidget.py)
7676
ADD_PYTHON_TEST(PyQgsPoint test_qgspoint.py)
77+
ADD_PYTHON_TEST(PyQgsPostgresDomain test_qgspostgresdomain.py)
7778
ADD_PYTHON_TEST(PyQgsRangeWidgets test_qgsrangewidgets.py)
7879
ADD_PYTHON_TEST(PyQgsRasterFileWriter test_qgsrasterfilewriter.py)
7980
ADD_PYTHON_TEST(PyQgsRasterLayer test_qgsrasterlayer.py)

‎tests/src/python/test_qgspostgresdomain.py

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# -*- coding: utf-8 -*-
2+
"""QGIS Unit tests for Postgres domains.
3+
4+
.. note:: This program is free software; you can redistribute it and/or modify
5+
it under the terms of the GNU General Public License as published by
6+
the Free Software Foundation; either version 2 of the License, or
7+
(at your option) any later version.
8+
"""
9+
__author__ = 'Denis Rouzaud'
10+
__date__ = '10/02/2018'
11+
__copyright__ = 'Copyright 2018, The QGIS Project'
12+
# This will get replaced with a git SHA1 when you do a git archive
13+
__revision__ = '$Format:%H$'
14+
15+
import qgis # NOQA
16+
17+
import os
18+
19+
from qgis.core import QgsVectorLayer, QgsMapLayerRegistry
20+
21+
from qgis.testing import start_app, unittest
22+
23+
start_app()
24+
25+
26+
class TestQgsPostgresDomain(unittest.TestCase):
27+
28+
@classmethod
29+
def setUpClass(cls):
30+
"""
31+
Setup the involved layer
32+
:return:
33+
"""
34+
cls.dbconn = 'service=\'qgis_test\''
35+
if 'QGIS_PGTEST_DB' in os.environ:
36+
cls.dbconn = os.environ['QGIS_PGTEST_DB']
37+
# Create test layer
38+
cls.vl = QgsVectorLayer(cls.dbconn + ' sslmode=disable key=\'pk\' table="qgis_test"."colors" sql=', 'colors', 'postgres')
39+
40+
QgsMapLayerRegistry.instance().addMapLayer(cls.vl, True)
41+
42+
def test_postgres_domain(self):
43+
self.assertEqual(self.vl.dataProvider().enumValues(1), ['red', 'green', 'blue'])
44+
self.assertEqual(self.vl.dataProvider().enumValues(2), ['yellow', 'cyan', 'magenta'])
45+
self.assertEqual(self.vl.dataProvider().enumValues(3), ['Alchemilla', 'Alstroemeria', 'Alyssum'])
46+
47+
48+
if __name__ == '__main__':
49+
unittest.main()

‎tests/testdata/provider/testdata_pg.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ SCRIPTS="
55
tests/testdata/provider/testdata_pg_reltests.sql
66
tests/testdata/provider/testdata_pg_vectorjoin.sql
77
tests/testdata/provider/testdata_pg_raster.sql
8+
tests/testdata/provider/testdata_pg_domain.sql
89
"
910

1011
createdb qgis_test || exit 1

‎tests/testdata/provider/testdata_pg_domain.sql

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
3+
4+
CREATE DOMAIN public.colordomain
5+
AS text
6+
COLLATE pg_catalog."default"
7+
CONSTRAINT domainconstraint CHECK (VALUE = ANY (ARRAY['red'::text, 'green'::text, 'blue'::text]));
8+
9+
CREATE DOMAIN qgis_test.colordomain
10+
AS text
11+
COLLATE pg_catalog."default"
12+
CONSTRAINT domainconstraint CHECK (VALUE = ANY (ARRAY['yellow'::text, 'cyan'::text, 'magenta'::text]));
13+
14+
CREATE DOMAIN qgis_test.flowerdomain
15+
AS text
16+
COLLATE pg_catalog."default"
17+
CONSTRAINT domainconstraint CHECK (VALUE = ANY (ARRAY['Alchemilla'::text, 'Alstroemeria'::text, 'Alyssum'::text]));
18+
19+
CREATE TABLE qgis_test.colors
20+
(
21+
id SERIAL NOT NULL,
22+
color_public colordomain,
23+
color_qgis qgis_test.colordomain,
24+
flower qgis_test.flowerdomain
25+
)

0 commit comments

Comments
 (0)
Please sign in to comment.