PG: fix issue GH #54572 st_geographyfromtext

elpaso · elpaso · commit add14bfbd31e · 2023-09-19T13:47:06.000+02:00
Fix #54572 Error saving edit on PostGIS geometry when table also contains geography
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -2616,7 +2616,7 @@ bool QgsPostgresProvider::addFeatures( QgsFeatureList &flist, Flags flags )
         }
         else if ( fieldTypeName == QLatin1String( "geography" ) )
         {
-          values += QStringLiteral( "%1st_geographyfromewkt(%2)" )
+          values += QStringLiteral( "%1st_geographyfromtext(%2)" )
                     .arg( delim,
                           quotedValue( v.toString() ) );
         }
@@ -2650,7 +2650,7 @@ bool QgsPostgresProvider::addFeatures( QgsFeatureList &flist, Flags flags )
         }
         else if ( fieldTypeName == QLatin1String( "geography" ) )
         {
-          values += QStringLiteral( "%1st_geographyfromewkt($%2)" )
+          values += QStringLiteral( "%1st_geographyfromtext($%2)" )
                     .arg( delim )
                     .arg( defaultValues.size() + offset );
         }
@@ -3223,7 +3223,7 @@ bool QgsPostgresProvider::changeAttributeValues( const QgsChangedAttributesMap &
           }
           else if ( fld.typeName() == QLatin1String( "geography" ) )
           {
-            sql += QStringLiteral( "st_geographyfromewkt(%1)" )
+            sql += QStringLiteral( "st_geographyfromtext(%1)" )
                    .arg( quotedValue( siter->toString() ) );
           }
           else if ( fld.typeName() == QLatin1String( "jsonb" ) )
@@ -3588,7 +3588,7 @@ bool QgsPostgresProvider::changeFeatures( const QgsChangedAttributesMap &attr_ma
           }
           else if ( fld.typeName() == QLatin1String( "geography" ) )
           {
-            sql += QStringLiteral( "st_geographyfromewkt(%1)" )
+            sql += QStringLiteral( "st_geographyfromtext(%1)" )
                    .arg( quotedValue( siter->toString() ) );
           }
           else if ( fld.typeName() == QLatin1String( "jsonb" ) )
diff --git a/tests/src/python/test_provider_postgres.py b/tests/src/python/test_provider_postgres.py
@@ -3280,6 +3280,28 @@ def reportError(self, error, fatalError=False):
             extracted_fids = [f['id'] for f in vl_result.getFeatures()]
             self.assertEqual(set(extracted_fids), {1, 2})  # Bug ?
 
+    def testGeographyAddFeature(self):
+        """Test issue GH #54572 Error saving edit on PostGIS geometry when table also contains geography"""
+
+        self.execSQLCommand(
+            'DROP TABLE IF EXISTS qgis_test."geom_and_geog" CASCADE')
+        self.execSQLCommand("""
+            CREATE TABLE qgis_test.geom_and_geog (
+                pkey SERIAL PRIMARY KEY,
+                geom geometry(POLYGON, 3857),
+                geog geography(POLYGON, 4326)
+            );""")
+
+        vl = QgsVectorLayer(self.dbconn + ' sslmode=disable key=\'pkey\' srid=3857 table="qgis_test"."geom_and_geog" (geom) sql=', 'geom_and_geog', 'postgres')
+        self.assertTrue(vl.isValid())
+        self.assertEqual(vl.featureCount(), 0)
+        dp = vl.dataProvider()
+        f = QgsFeature(vl.fields())
+        f.setGeometry(QgsGeometry.fromWkt('POLYGON((28.030080546000004 -26.2055410477482,28.030103891999996 -26.20540054874821,28.030532775999998 -26.205458576748192,28.030553322999996 -26.2056050407482,28.030080546000004 -26.2055410477482))'))
+        f.setAttribute('geog', 'POLYGON((28.030080546000004 -26.2055410477482,28.030103891999996 -26.20540054874821,28.030532775999998 -26.205458576748192,28.030553322999996 -26.2056050407482,28.030080546000004 -26.2055410477482))')
+        self.assertTrue(dp.addFeature(f))
+        self.assertEqual(vl.featureCount(), 1)
+
 
 class TestPyQgsPostgresProviderCompoundKey(QgisTestCase, ProviderTestCase):
 

Original file line number	Diff line number	Diff line change
`@@ -2616,7 +2616,7 @@ bool QgsPostgresProvider::addFeatures( QgsFeatureList &flist, Flags flags )`
`2616`	`2616`	`}`
`2617`	`2617`	`else if ( fieldTypeName == QLatin1String( "geography" ) )`
`2618`	`2618`	`{`
`2619`		`- values += QStringLiteral( "%1st_geographyfromewkt(%2)" )`
	`2619`	`+ values += QStringLiteral( "%1st_geographyfromtext(%2)" )`
`2620`	`2620`	`.arg( delim,`
`2621`	`2621`	`quotedValue( v.toString() ) );`
`2622`	`2622`	`}`
`@@ -2650,7 +2650,7 @@ bool QgsPostgresProvider::addFeatures( QgsFeatureList &flist, Flags flags )`
`2650`	`2650`	`}`
`2651`	`2651`	`else if ( fieldTypeName == QLatin1String( "geography" ) )`
`2652`	`2652`	`{`
`2653`		`- values += QStringLiteral( "%1st_geographyfromewkt($%2)" )`
	`2653`	`+ values += QStringLiteral( "%1st_geographyfromtext($%2)" )`
`2654`	`2654`	`.arg( delim )`
`2655`	`2655`	`.arg( defaultValues.size() + offset );`
`2656`	`2656`	`}`
`@@ -3223,7 +3223,7 @@ bool QgsPostgresProvider::changeAttributeValues( const QgsChangedAttributesMap &`
`3223`	`3223`	`}`
`3224`	`3224`	`else if ( fld.typeName() == QLatin1String( "geography" ) )`
`3225`	`3225`	`{`
`3226`		`- sql += QStringLiteral( "st_geographyfromewkt(%1)" )`
	`3226`	`+ sql += QStringLiteral( "st_geographyfromtext(%1)" )`
`3227`	`3227`	`.arg( quotedValue( siter->toString() ) );`
`3228`	`3228`	`}`
`3229`	`3229`	`else if ( fld.typeName() == QLatin1String( "jsonb" ) )`
`@@ -3588,7 +3588,7 @@ bool QgsPostgresProvider::changeFeatures( const QgsChangedAttributesMap &attr_ma`
`3588`	`3588`	`}`
`3589`	`3589`	`else if ( fld.typeName() == QLatin1String( "geography" ) )`
`3590`	`3590`	`{`
`3591`		`- sql += QStringLiteral( "st_geographyfromewkt(%1)" )`
	`3591`	`+ sql += QStringLiteral( "st_geographyfromtext(%1)" )`
`3592`	`3592`	`.arg( quotedValue( siter->toString() ) );`
`3593`	`3593`	`}`
`3594`	`3594`	`else if ( fld.typeName() == QLatin1String( "jsonb" ) )`