Consider srid to avoid mixed geometry errors

qgis · Jul 28, 2021 · a0f0823 · a0f0823
1 parent 385f73e
commit a0f0823
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/providers/postgres/qgspostgresconn.cpp b/src/providers/postgres/qgspostgresconn.cpp
@@ -1239,13 +1239,6 @@ QString QgsPostgresConn::quotedValue( const QVariant &value )
     case QVariant::List:
       return quotedList( value.toList() );
 
-    case QVariant::UserType:
-      if ( value.canConvert<QgsGeometry>() )
-      {
-        QgsGeometry geom = value.value<QgsGeometry>();
-        return QString( "ST_GeomFromText('%1')" ).arg( geom.asWkt() );
-      }
-
     case QVariant::Double:
     case QVariant::String:
     default:

diff --git a/src/providers/postgres/qgspostgresexpressioncompiler.cpp b/src/providers/postgres/qgspostgresexpressioncompiler.cpp
@@ -44,6 +44,13 @@ QString QgsPostgresExpressionCompiler::quotedValue( const QVariant &value, bool
     case QVariant::Double:
       return value.toString();
 
+    case QVariant::UserType:
+      if ( value.canConvert<QgsGeometry>() )
+      {
+        QgsGeometry geom = value.value<QgsGeometry>();
+        return QString( "ST_GeomFromText('%1',%2)" ).arg( geom.asWkt() ).arg( mRequestedSrid.isEmpty() ? mDetectedSrid : mRequestedSrid );
+      }
+
     default:
       break;
   }

diff --git a/tests/src/providers/testqgspostgresexpressioncompiler.cpp b/tests/src/providers/testqgspostgresexpressioncompiler.cpp
@@ -54,7 +54,7 @@ void TestQgsPostgresExpressionCompiler::testGeometryFromWkt()
   QgsSqlExpressionCompiler::Result r = compiler.compile( &exp );
   QCOMPARE( r, QgsSqlExpressionCompiler::Complete );
   QString sql = compiler.result();
-  QCOMPARE( sql, QStringLiteral( "ST_Intersects(\"geom\",ST_GeomFromText('Polygon ((0 0, 1 0, 1 1, 0 1, 0 0))'))" ) );
+  QCOMPARE( sql, QStringLiteral( "ST_Intersects(\"geom\",ST_GeomFromText('Polygon ((0 0, 1 0, 1 1, 0 1, 0 0))',4326))" ) );
 }
 
 QGSTEST_MAIN( TestQgsPostgresExpressionCompiler )