yet another postgres provider update

jef · jef · commit a0c1772d4cef · 2008-03-28T11:02:05.000Z
- apply patch #1009 from Steven Mizuno. Thanks. - remove column name and use of PQfnumber for cursors git-svn-id: http://svn.osgeo.org/qgis/trunk@8292 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -379,7 +379,7 @@ bool QgsPostgresProvider::declareCursor(const QString &cursorName,
 
     if(fetchGeometry)
     {
-      declare += QString(",asbinary(%1,'%2') as qgs_feature_geometry")
+      declare += QString(",asbinary(%1,'%2')")
         .arg( quotedIdentifier(geometryColumn) )
         .arg( endianString() ); 
     }
@@ -393,22 +393,21 @@ bool QgsPostgresProvider::declareCursor(const QString &cursorName,
         continue;
 
       const QString &type = fld.typeName();
-      if( type == "money" || type.startsWith("_") )
+      if( type == "money" )
       {
-        // money and arrays don't support cast to text, but return text
-        // TODO: check other types
-        declare += "," + quotedIdentifier( fieldname );
+        declare += QString(",cash_out(%1)").arg( quotedIdentifier(fieldname) );
+      }
+      else if( type.startsWith("_") )
+      {
+        declare += QString(",array_out(%1)").arg( quotedIdentifier(fieldname) );
       }
       else if( type == "bool" )
       {
-        // bool doesn't support cast to text either and even doesn't return text.
-        // (even text() doesn't work with binary cursors)
-        declare += QString(",CASE WHEN %1 THEN 't' WHEN NOT %1 THEN 'f' ELSE NULL END AS %1")
-          .arg( quotedIdentifier(fieldname) );
+        declare += QString(",boolout(%1)").arg( quotedIdentifier(fieldname) );
       }
       else
       {
-        declare += "," + quotedIdentifier( fieldname ) + "::text";
+        declare += "," + quotedIdentifier(fieldname) + "::text";
       }
     }
 
@@ -439,7 +438,7 @@ bool QgsPostgresProvider::getFeature(PGresult *queryResult, int row, bool fetchG
 
     feature.setFeatureId(oid);
 
-    int col;  // first attribute column
+    int col;  // first attribute column after geometry
 
     if (fetchGeometry)
     {
@@ -448,7 +447,7 @@ bool QgsPostgresProvider::getFeature(PGresult *queryResult, int row, bool fetchG
       {
         unsigned char *featureGeom = new unsigned char[returnedLength + 1];
         memset(featureGeom, '\0', returnedLength + 1);
-        memcpy(featureGeom, PQgetvalue(queryResult, row, PQfnumber(queryResult,QString("qgs_feature_geometry").toUtf8())), returnedLength); 
+        memcpy(featureGeom, PQgetvalue(queryResult, row, 1), returnedLength); 
         feature.setGeometryAndOwnership(featureGeom, returnedLength + 1);
       }
       else

Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,7 @@ bool QgsPostgresProvider::declareCursor(const QString &cursorName,`
`379`	`379`
`380`	`380`	`if(fetchGeometry)`
`381`	`381`	`{`
`382`		`- declare += QString(",asbinary(%1,'%2') as qgs_feature_geometry")`
	`382`	`+ declare += QString(",asbinary(%1,'%2')")`
`383`	`383`	`.arg( quotedIdentifier(geometryColumn) )`
`384`	`384`	`.arg( endianString() );`
`385`	`385`	`}`
`@@ -393,22 +393,21 @@ bool QgsPostgresProvider::declareCursor(const QString &cursorName,`
`393`	`393`	`continue;`
`394`	`394`
`395`	`395`	`const QString &type = fld.typeName();`
`396`		`- if( type == "money" \|\| type.startsWith("_") )`
	`396`	`+ if( type == "money" )`
`397`	`397`	`{`
`398`		`- // money and arrays don't support cast to text, but return text`
`399`		`- // TODO: check other types`
`400`		`- declare += "," + quotedIdentifier( fieldname );`
	`398`	`+ declare += QString(",cash_out(%1)").arg( quotedIdentifier(fieldname) );`
	`399`	`+ }`
	`400`	`+ else if( type.startsWith("_") )`
	`401`	`+ {`
	`402`	`+ declare += QString(",array_out(%1)").arg( quotedIdentifier(fieldname) );`
`401`	`403`	`}`
`402`	`404`	`else if( type == "bool" )`
`403`	`405`	`{`
`404`		`- // bool doesn't support cast to text either and even doesn't return text.`
`405`		`- // (even text() doesn't work with binary cursors)`
`406`		`- declare += QString(",CASE WHEN %1 THEN 't' WHEN NOT %1 THEN 'f' ELSE NULL END AS %1")`
`407`		`- .arg( quotedIdentifier(fieldname) );`
	`406`	`+ declare += QString(",boolout(%1)").arg( quotedIdentifier(fieldname) );`
`408`	`407`	`}`
`409`	`408`	`else`
`410`	`409`	`{`
`411`		`- declare += "," + quotedIdentifier( fieldname ) + "::text";`
	`410`	`+ declare += "," + quotedIdentifier(fieldname) + "::text";`
`412`	`411`	`}`
`413`	`412`	`}`
`414`	`413`
`@@ -439,7 +438,7 @@ bool QgsPostgresProvider::getFeature(PGresult *queryResult, int row, bool fetchG`
`439`	`438`
`440`	`439`	`feature.setFeatureId(oid);`
`441`	`440`
`442`		`- int col; // first attribute column`
	`441`	`+ int col; // first attribute column after geometry`
`443`	`442`
`444`	`443`	`if (fetchGeometry)`
`445`	`444`	`{`
`@@ -448,7 +447,7 @@ bool QgsPostgresProvider::getFeature(PGresult *queryResult, int row, bool fetchG`
`448`	`447`	`{`
`449`	`448`	`unsigned char *featureGeom = new unsigned char[returnedLength + 1];`
`450`	`449`	`memset(featureGeom, '\0', returnedLength + 1);`
`451`		`- memcpy(featureGeom, PQgetvalue(queryResult, row, PQfnumber(queryResult,QString("qgs_feature_geometry").toUtf8())), returnedLength);`
	`450`	`+ memcpy(featureGeom, PQgetvalue(queryResult, row, 1), returnedLength);`
`452`	`451`	`feature.setGeometryAndOwnership(featureGeom, returnedLength + 1);`
`453`	`452`	`}`
`454`	`453`	`else`