Showing with 8 additions and 8 deletions.
  1. +1 −1 src/gui/qgsexpressionbuilderwidget.cpp
  2. +1 −1 src/gui/qgsquerybuilder.cpp
  3. +6 −6 src/providers/postgres/qgspostgresconn.cpp
2 changes: 1 addition & 1 deletion src/gui/qgsexpressionbuilderwidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ void QgsExpressionBuilderWidget::on_txtExpressionString_textChanged()
{
if ( !mFeature.isValid() )
{
mLayer->select( mLayer->pendingAllAttributesList() );
mLayer->select( mLayer->pendingAllAttributesList(), QgsRectangle(), mLayer->geometryType() != QGis::NoGeometry && exp.needsGeometry() );
mLayer->nextFeature( mFeature );
}

Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsquerybuilder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ void QgsQueryBuilder::on_lstValues_doubleClicked( const QModelIndex &index )
else if ( value.type() == QVariant::Int || value.type() == QVariant::Double || value.type() == QVariant::LongLong )
txtSQL->insertPlainText( value.toString() );
else
txtSQL->insertPlainText( "'" + value.toString() + "'" );
txtSQL->insertPlainText( "'" + value.toString().replace( "'", "''" ) + "'" );
}

void QgsQueryBuilder::on_btnLessEqual_clicked()
Expand Down
12 changes: 6 additions & 6 deletions src/providers/postgres/qgspostgresconn.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,11 +364,11 @@ bool QgsPostgresConn::getTableInfo( bool searchGeometryColumnsOnly, bool searchP
QString relkind = result.PQgetvalue( idx, 5 );

QgsDebugMsg( QString( "%1 : %2.%3.%4: %5 %6 %7" )
.arg( gtableName )
.arg( schemaName ).arg( tableName ).arg( column )
.arg( type )
.arg( srid )
.arg( relkind ) );
.arg( gtableName )
.arg( schemaName ).arg( tableName ).arg( column )
.arg( type )
.arg( srid )
.arg( relkind ) );

layerProperty.type = type;
layerProperty.schemaName = schemaName;
Expand Down Expand Up @@ -498,7 +498,7 @@ bool QgsPostgresConn::getTableInfo( bool searchGeometryColumnsOnly, bool searchP
QgsMessageLog::logMessage( tr( "Database connection was successful, but the accessible tables could not be determined.\nThe error message from the database was:\n%1" )
.arg( result.PQresultErrorMessage() ),
tr( "PostGIS" ) );
return -1;
return false;
}

for ( int i = 0; i < result.PQntuples(); i++ )
Expand Down