followup on r15028: more postgis st_ fixes

jef · jef · commit cadf0aa78b26 · 2011-01-13T22:37:41.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15037 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -372,7 +372,7 @@ QString QgsPostgresProvider::fieldExpression( const QgsField &fld ) const
   }
   else if ( type == "geometry" )
   {
-    return QString( "asewkt(%1)" ).arg( quotedIdentifier( fld.name() ) );
+    return QString( "st_asewkt(%1)" ).arg( quotedIdentifier( fld.name() ) );
   }
   else if ( type == "geography" )
   {
@@ -407,7 +407,7 @@ bool QgsPostgresProvider::declareCursor(
       }
       else
       {
-        query += QString( ",asbinary(%1,'%2')" )
+        query += QString( ",st_asbinary(%1,'%2')" )
                  .arg( quotedIdentifier( geometryColumn ) )
                  .arg( endianString() );
       }

Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,7 @@ QString QgsPostgresProvider::fieldExpression( const QgsField &fld ) const`
`372`	`372`	`}`
`373`	`373`	`else if ( type == "geometry" )`
`374`	`374`	`{`
`375`		`- return QString( "asewkt(%1)" ).arg( quotedIdentifier( fld.name() ) );`
	`375`	`+ return QString( "st_asewkt(%1)" ).arg( quotedIdentifier( fld.name() ) );`
`376`	`376`	`}`
`377`	`377`	`else if ( type == "geography" )`
`378`	`378`	`{`
`@@ -407,7 +407,7 @@ bool QgsPostgresProvider::declareCursor(`
`407`	`407`	`}`
`408`	`408`	`else`
`409`	`409`	`{`
`410`		`- query += QString( ",asbinary(%1,'%2')" )`
	`410`	`+ query += QString( ",st_asbinary(%1,'%2')" )`
`411`	`411`	`.arg( quotedIdentifier( geometryColumn ) )`
`412`	`412`	`.arg( endianString() );`
`413`	`413`	`}`