Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix #2707
git-svn-id: http://svn.osgeo.org/qgis/trunk@13470 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed May 12, 2010
1 parent 328f7d7 commit 64d2fc8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions src/providers/postgres/qgspostgresprovider.cpp
Expand Up @@ -2205,10 +2205,10 @@ QString QgsPostgresProvider::Conn::postgisVersion()
return postgisVersionInfo;
}

QByteArray QgsPostgresProvider::paramValue( QString fieldValue, const QString &defaultValue ) const
QString QgsPostgresProvider::paramValue( QString fieldValue, const QString &defaultValue ) const
{
if ( fieldValue.isNull() )
return QByteArray( 0 ); // QByteArray(0).isNull() is true
return QString::null;

if ( fieldValue == defaultValue && !defaultValue.isNull() )
{
Expand All @@ -2219,17 +2219,17 @@ QByteArray QgsPostgresProvider::paramValue( QString fieldValue, const QString &d
if ( PQgetisnull( result, 0, 0 ) )
{
PQclear( result );
return QByteArray( 0 ); // QByteArray(0).isNull() is true
return QString::null;
}
else
{
QString val = QString::fromUtf8( PQgetvalue( result, 0, 0 ) );
PQclear( result );
return val.toUtf8();
return val;
}
}

return fieldValue.toUtf8();
return fieldValue;
}

bool QgsPostgresProvider::addFeatures( QgsFeatureList &flist )
Expand Down
2 changes: 1 addition & 1 deletion src/providers/postgres/qgspostgresprovider.h
Expand Up @@ -588,7 +588,7 @@ class QgsPostgresProvider : public QgsVectorDataProvider
void customEvent( QEvent *e );

void appendGeomString( QgsGeometry *geom, QString &geomParam ) const;
QByteArray paramValue( QString fieldvalue, const QString &defaultValue ) const;
QString paramValue( QString fieldvalue, const QString &defaultValue ) const;

class Conn
{
Expand Down

0 comments on commit 64d2fc8

Please sign in to comment.