fix #2707

jef · jef · commit 64d2fc82868c · 2010-05-12T22:45:25.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@13470 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -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() )
   {
@@ -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 )
diff --git a/src/providers/postgres/qgspostgresprovider.h b/src/providers/postgres/qgspostgresprovider.h
@@ -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
     {

Original file line number	Diff line number	Diff line change
`@@ -2205,10 +2205,10 @@ QString QgsPostgresProvider::Conn::postgisVersion()`
`2205`	`2205`	`return postgisVersionInfo;`
`2206`	`2206`	`}`
`2207`	`2207`
`2208`		`-QByteArray QgsPostgresProvider::paramValue( QString fieldValue, const QString &defaultValue ) const`
	`2208`	`+QString QgsPostgresProvider::paramValue( QString fieldValue, const QString &defaultValue ) const`
`2209`	`2209`	`{`
`2210`	`2210`	`if ( fieldValue.isNull() )`
`2211`		`- return QByteArray( 0 ); // QByteArray(0).isNull() is true`
	`2211`	`+ return QString::null;`
`2212`	`2212`
`2213`	`2213`	`if ( fieldValue == defaultValue && !defaultValue.isNull() )`
`2214`	`2214`	`{`
`@@ -2219,17 +2219,17 @@ QByteArray QgsPostgresProvider::paramValue( QString fieldValue, const QString &d`
`2219`	`2219`	`if ( PQgetisnull( result, 0, 0 ) )`
`2220`	`2220`	`{`
`2221`	`2221`	`PQclear( result );`
`2222`		`- return QByteArray( 0 ); // QByteArray(0).isNull() is true`
	`2222`	`+ return QString::null;`
`2223`	`2223`	`}`
`2224`	`2224`	`else`
`2225`	`2225`	`{`
`2226`	`2226`	`QString val = QString::fromUtf8( PQgetvalue( result, 0, 0 ) );`
`2227`	`2227`	`PQclear( result );`
`2228`		`- return val.toUtf8();`
	`2228`	`+ return val;`
`2229`	`2229`	`}`
`2230`	`2230`	`}`
`2231`	`2231`
`2232`		`- return fieldValue.toUtf8();`
	`2232`	`+ return fieldValue;`
`2233`	`2233`	`}`
`2234`	`2234`
`2235`	`2235`	`bool QgsPostgresProvider::addFeatures( QgsFeatureList &flist )`
Original file line number	Diff line number	Diff line change
`@@ -588,7 +588,7 @@ class QgsPostgresProvider : public QgsVectorDataProvider`
`588`	`588`	`void customEvent( QEvent *e );`
`589`	`589`
`590`	`590`	`void appendGeomString( QgsGeometry *geom, QString &geomParam ) const;`
`591`		`- QByteArray paramValue( QString fieldvalue, const QString &defaultValue ) const;`
	`591`	`+ QString paramValue( QString fieldvalue, const QString &defaultValue ) const;`
`592`	`592`
`593`	`593`	`class Conn`
`594`	`594`	`{`