Skip to content
Permalink
Browse files

database provider: fix andWhereClauses

  • Loading branch information
jef-n committed Aug 4, 2015
1 parent 0c2b510 commit c27f357be02237b28a9038a1b7e1da943794419e
Showing with 4 additions and 4 deletions.
  1. +2 −2 src/providers/oracle/qgsoracleprovider.cpp
  2. +2 −2 src/providers/postgres/qgspostgresprovider.cpp
@@ -466,9 +466,9 @@ QString QgsOracleUtils::whereClause( QgsFeatureIds featureIds, const QgsFields &

QString QgsOracleUtils::andWhereClauses( const QString& c1, const QString& c2 )
{
if ( c1.isNull() )
if ( c1.isEmpty() )
return c2;
if ( c2.isNull() )
if ( c2.isEmpty() )
return c1;

return QString( "(%1) AND (%2)" ).arg( c1 ).arg( c2 );
@@ -550,9 +550,9 @@ QString QgsPostgresUtils::whereClause( QgsFeatureIds featureIds, const QgsFields

QString QgsPostgresUtils::andWhereClauses( const QString& c1, const QString& c2 )
{
if ( c1.isNull() )
if ( c1.isEmpty() )
return c2;
if ( c2.isNull() )
if ( c2.isEmpty() )
return c1;

return QString( "(%1) AND (%2)" ).arg( c1 ).arg( c2 );

0 comments on commit c27f357

Please sign in to comment.
You can’t perform that action at this time.