Skip to content

Commit 1c64363

Browse files
committed
postgres provider: avoid quering layer_styles if it doesn't exist
1 parent 12739c2 commit 1c64363

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

src/providers/postgres/qgspostgresprovider.cpp

+8-1
Original file line numberDiff line numberDiff line change
@@ -3581,6 +3581,12 @@ QGISEXTERN QString loadStyle( const QString& uri, QString& errCause )
35813581
return "";
35823582
}
35833583

3584+
QgsPostgresResult result = conn->PQexec( "SELECT COUNT(*) FROM information_schema.tables WHERE table_name='layer_styles'" );
3585+
if ( result.PQgetvalue( 0, 0 ).toInt() == 0 )
3586+
{
3587+
return "";
3588+
}
3589+
35843590
QString selectQmlQuery = QString( "SELECT styleQML"
35853591
" FROM layer_styles"
35863592
" WHERE f_table_catalog=%1"
@@ -3594,10 +3600,11 @@ QGISEXTERN QString loadStyle( const QString& uri, QString& errCause )
35943600
.arg( QgsPostgresConn::quotedValue( dsUri.table() ) )
35953601
.arg( QgsPostgresConn::quotedValue( dsUri.geometryColumn() ) );
35963602

3597-
QgsPostgresResult result = conn->PQexec( selectQmlQuery, false );
3603+
result = conn->PQexec( selectQmlQuery );
35983604

35993605
QString style = result.PQntuples() == 1 ? result.PQgetvalue( 0, 0 ) : "";
36003606
conn->unref();
3607+
36013608
return style;
36023609
}
36033610

0 commit comments

Comments
 (0)