[Backport 3.34] [PostgreSQL provider] Add missing namespace escaping in SQL requests

src/providers/postgres/qgspostgresconn.cpp

@@ -48,6 +48,16 @@
 
 const int PG_DEFAULT_TIMEOUT = 30;
 
+static QString quotedString( const QString &v )
+{
+  QString result = v;
+  result.replace( '\'', QLatin1String( "''" ) );
+  if ( result.contains( '\\' ) )
+    return result.replace( '\\', QLatin1String( "\\\\" ) ).prepend( "E'" ).append( '\'' );
+  else
+    return result.prepend( '\'' ).append( '\'' );
+}
+
 QgsPostgresResult::~QgsPostgresResult()
 {
   if ( mRes )
@@ -708,7 +718,7 @@ bool QgsPostgresConn::getTableInfo( bool searchGeometryColumnsOnly, bool searchP
       sql += QLatin1String( " AND n.nspname='public'" );
 
     if ( !schema.isEmpty() )
-      sql += QStringLiteral( " AND %1='%2'" ).arg( schemaName, schema );
+      sql += QStringLiteral( " AND %1=%2" ).arg( schemaName, quotedString( schema ) );
 
     sql += QString( " GROUP BY 1,2,3,4,5,6,7,c.oid,11" );
 
@@ -848,7 +858,7 @@ bool QgsPostgresConn::getTableInfo( bool searchGeometryColumnsOnly, bool searchP
       sql += QLatin1String( " AND n.nspname='public'" );
 
     if ( !schema.isEmpty() )
-      sql += QStringLiteral( " AND n.nspname='%2'" ).arg( schema );
+      sql += QStringLiteral( " AND n.nspname=%1" ).arg( quotedString( schema ) );
 
     // skip columns of which we already derived information from the metadata tables
     if ( nColumns > 0 )
@@ -987,7 +997,7 @@ bool QgsPostgresConn::getTableInfo( bool searchGeometryColumnsOnly, bool searchP
       sql += QLatin1String( " AND pg_namespace.nspname='public'" );
 
     if ( !schema.isEmpty() )
-      sql += QStringLiteral( " AND pg_namespace.nspname='%2'" ).arg( schema );
+      sql += QStringLiteral( " AND pg_namespace.nspname=%1" ).arg( quotedString( schema ) );
 
     sql += QLatin1String( " GROUP BY 1,2,3,4" );
 
@@ -1329,16 +1339,6 @@ QString QgsPostgresConn::quotedIdentifier( const QString &ident )
   return result.prepend( '\"' ).append( '\"' );
 }
 
-static QString quotedString( const QString &v )
-{
-  QString result = v;
-  result.replace( '\'', QLatin1String( "''" ) );
-  if ( result.contains( '\\' ) )
-    return result.replace( '\\', QLatin1String( "\\\\" ) ).prepend( "E'" ).append( '\'' );
-  else
-    return result.prepend( '\'' ).append( '\'' );
-}
-
 static QString doubleQuotedMapValue( const QString &v )
 {
   QString result = v;
@@ -2933,7 +2933,7 @@ int QgsPostgresConn::crsToSrid( const QgsCoordinateReferenceSystem &crs )
       return -1;
     const QString authName = authParts.first();
     const QString authId = authParts.last();
-    QgsPostgresResult result( PQexec( QStringLiteral( "SELECT srid FROM spatial_ref_sys WHERE auth_name='%1' AND auth_srid=%2" ).arg( authName, authId ) ) );
+    QgsPostgresResult result( PQexec( QStringLiteral( "SELECT srid FROM spatial_ref_sys WHERE auth_name=%1 AND auth_srid=%2" ).arg( quotedString( authName ), authId ) ) );
 
     if ( result.PQresultStatus() == PGRES_TUPLES_OK )
     {

src/providers/postgres/qgspostgresdataitemguiprovider.cpp

@@ -307,7 +307,7 @@ void QgsPostgresDataItemGuiProvider::deleteSchema( QgsPGSchemaItem *schemaItem,
     return;
   }
 
-  const QString sql = QStringLiteral( "SELECT table_name FROM information_schema.tables WHERE table_schema='%1'" ).arg( schemaItem->name() );
+  const QString sql = QStringLiteral( "SELECT table_name FROM information_schema.tables WHERE table_schema=%1" ).arg( QgsPostgresConn::quotedValue( schemaItem->name() ) );
   QgsPostgresResult result( conn->LoggedPQexec( "QgsPostgresDataItemGuiProvider", sql ) );
   if ( result.PQresultStatus() != PGRES_TUPLES_OK )
   {

src/providers/postgres/qgspostgresproviderconnection.cpp

@@ -696,12 +696,11 @@ QList<QgsPostgresProviderConnection::TableProperty> QgsPostgresProviderConnectio
             {
               const QList<QVariantList> pks = executeSqlPrivate( QStringLiteral( R"(
               WITH pkrelid AS (
-              SELECT indexrelid AS idxri FROM pg_index WHERE indrelid='%1.%2'::regclass AND (indisprimary OR indisunique)
+              SELECT indexrelid AS idxri FROM pg_index WHERE indrelid=%1::regclass AND (indisprimary OR indisunique)
                 ORDER BY CASE WHEN indisprimary THEN 1 ELSE 2 END LIMIT 1)
               SELECT attname FROM pg_index,pg_attribute, pkrelid
               WHERE indexrelid=pkrelid.idxri AND indrelid=attrelid AND pg_attribute.attnum=any(pg_index.indkey);
-             )" ).arg( QgsPostgresConn::quotedIdentifier( pr.schemaName ),
-                                                  QgsPostgresConn::quotedIdentifier( pr.tableName ) ), false );
+             )" ).arg( QgsPostgresConn::quotedValue( QString( QgsPostgresConn::quotedIdentifier( pr.schemaName ) + "." + QgsPostgresConn::quotedIdentifier( pr.tableName ) ) ) ), false );
               QStringList pkNames;
               for ( const QVariantList &pk : std::as_const( pks ) )
               {

tests/src/python/test_processing_importintopostgis.py

@@ -58,7 +58,7 @@ def setUpClass(cls):
         settings.setValue('database', 'qgis_test')
 
     def test_import(self):
-        """Test algorithm with CamelCaseSchema"""
+        """Test algorithm with CamelCase'singlequote'Schema"""
 
         alg = self.registry.createAlgorithmById("qgis:importintopostgis")
         self.assertIsNotNone(alg)
@@ -76,7 +76,7 @@ def test_import(self):
             'LOWERCASE_NAMES': True,
             'OVERWRITE': True,
             'PRIMARY_KEY': None,
-            'SCHEMA': 'CamelCaseSchema',
+            'SCHEMA': "CamelCase'singlequote'Schema",
             'TABLENAME': table_name
         }
 
@@ -90,7 +90,7 @@ def test_import(self):
         # Check that data have been imported correctly
         exported = QgsVectorLayer(unitTestDataPath() + '/points.shp', 'exported')
         self.assertTrue(exported.isValid())
-        imported = QgsVectorLayer(f"service='qgis_test' table=\"CamelCaseSchema\".\"{table_name}\" (geom)", 'imported', 'postgres')
+        imported = QgsVectorLayer(f"service='qgis_test' table=\"CamelCase'singlequote'Schema\".\"{table_name}\" (geom)", 'imported', 'postgres')
         self.assertTrue(imported.isValid())
         imported_fields = [f.name() for f in imported.fields()]
         for f in exported.fields():

tests/src/python/test_qgsdatabaseschemacombobox.py

@@ -51,10 +51,10 @@ def testCombo(self):
         self.assertGreaterEqual(m.comboBox().count(), 3)
 
         text = [m.comboBox().itemText(i) for i in range(m.comboBox().count())]
-        self.assertIn('CamelCaseSchema', text)
+        self.assertIn("CamelCase'singlequote'Schema", text)
         self.assertIn('qgis_test', text)
-        self.assertLess(text.index('CamelCaseSchema'), text.index('qgis_test'))
-        self.assertEqual(m.currentSchema(), 'CamelCaseSchema')
+        self.assertLess(text.index("CamelCase'singlequote'Schema"), text.index('qgis_test'))
+        self.assertEqual(m.currentSchema(), "CamelCase'singlequote'Schema")
 
         m.setSchema('qgis_test')
         self.assertEqual(m.currentSchema(), 'qgis_test')
@@ -125,10 +125,10 @@ def testComboWithEmpty(self):
 
         text = [m.comboBox().itemText(i) for i in range(m.comboBox().count())]
         self.assertFalse(text[0])
-        self.assertIn('CamelCaseSchema', text)
+        self.assertIn("CamelCase'singlequote'Schema", text)
         self.assertIn('qgis_test', text)
-        self.assertLess(text.index('CamelCaseSchema'), text.index('qgis_test'))
-        self.assertEqual(m.currentSchema(), 'CamelCaseSchema')
+        self.assertLess(text.index("CamelCase'singlequote'Schema"), text.index('qgis_test'))
+        self.assertEqual(m.currentSchema(), "CamelCase'singlequote'Schema")
 
         m.setSchema('qgis_test')
         self.assertEqual(m.currentSchema(), 'qgis_test')

tests/src/python/test_qgsdatabaseschemamodel.py

@@ -50,7 +50,7 @@ def testModel(self):
         self.assertEqual(model.columnCount(), 1)
         schemas = [model.data(model.index(r, 0, QModelIndex()), Qt.DisplayRole) for r in range(model.rowCount())]
         self.assertIn('public', schemas)
-        self.assertIn('CamelCaseSchema', schemas)
+        self.assertIn("CamelCase'singlequote'Schema", schemas)
         self.assertIn('qgis_test', schemas)
         self.assertEqual(model.data(model.index(schemas.index('qgis_test'), 0, QModelIndex()), Qt.ToolTipRole), 'qgis_test')
         self.assertIsNone(model.data(model.index(model.rowCount(), 0, QModelIndex()), Qt.DisplayRole))
@@ -64,7 +64,7 @@ def testModel(self):
         self.assertEqual(model.rowCount(), old_count + 1)
         schemas = [model.data(model.index(r, 0, QModelIndex()), Qt.DisplayRole) for r in range(model.rowCount())]
         self.assertIn('public', schemas)
-        self.assertIn('CamelCaseSchema', schemas)
+        self.assertIn("CamelCase'singlequote'Schema", schemas)
         self.assertIn('qgis_test', schemas)
         self.assertIn('myNewSchema', schemas)
 
@@ -74,7 +74,7 @@ def testModel(self):
         self.assertEqual(model.rowCount(), old_count + 3)
         schemas = [model.data(model.index(r, 0, QModelIndex()), Qt.DisplayRole) for r in range(model.rowCount())]
         self.assertIn('public', schemas)
-        self.assertIn('CamelCaseSchema', schemas)
+        self.assertIn("CamelCase'singlequote'Schema", schemas)
         self.assertIn('qgis_test', schemas)
         self.assertIn('myNewSchema', schemas)
         self.assertIn('myNewSchema2', schemas)
@@ -87,7 +87,7 @@ def testModel(self):
         self.assertEqual(model.rowCount(), old_count + 2)
         schemas = [model.data(model.index(r, 0, QModelIndex()), Qt.DisplayRole) for r in range(model.rowCount())]
         self.assertIn('public', schemas)
-        self.assertIn('CamelCaseSchema', schemas)
+        self.assertIn("CamelCase'singlequote'Schema", schemas)
         self.assertIn('qgis_test', schemas)
         self.assertNotIn('myNewSchema', schemas)
         self.assertNotIn('myNewSchema2', schemas)
@@ -100,7 +100,7 @@ def testModel(self):
         self.assertEqual(model.rowCount(), old_count)
         schemas = [model.data(model.index(r, 0, QModelIndex()), Qt.DisplayRole) for r in range(model.rowCount())]
         self.assertIn('public', schemas)
-        self.assertIn('CamelCaseSchema', schemas)
+        self.assertIn("CamelCase'singlequote'Schema", schemas)
         self.assertIn('qgis_test', schemas)
         self.assertNotIn('myNewSchema3', schemas)
         self.assertNotIn('myNewSchema4', schemas)
@@ -117,7 +117,7 @@ def test_model_allow_empty(self):
 
         schemas = [model.data(model.index(r, 0, QModelIndex()), Qt.DisplayRole) for r in range(model.rowCount())]
         self.assertIn('public', schemas)
-        self.assertIn('CamelCaseSchema', schemas)
+        self.assertIn("CamelCase'singlequote'Schema", schemas)
         self.assertIn('qgis_test', schemas)
         self.assertFalse(model.data(model.index(0, 0, QModelIndex()), Qt.DisplayRole))
         self.assertTrue(model.data(model.index(0, 0, QModelIndex()), QgsDatabaseSchemaModel.RoleEmpty))
@@ -133,7 +133,7 @@ def test_model_allow_empty(self):
         self.assertEqual(model.rowCount(), old_count + 2)
         schemas = [model.data(model.index(r, 0, QModelIndex()), Qt.DisplayRole) for r in range(model.rowCount())]
         self.assertIn('public', schemas)
-        self.assertIn('CamelCaseSchema', schemas)
+        self.assertIn("CamelCase'singlequote'Schema", schemas)
         self.assertIn('qgis_test', schemas)
         self.assertIn('myNewSchema', schemas)
         self.assertFalse(model.data(model.index(0, 0, QModelIndex()), Qt.DisplayRole))
@@ -156,7 +156,7 @@ def test_model_allow_empty(self):
         self.assertEqual(model.rowCount(), old_count + 4)
         schemas = [model.data(model.index(r, 0, QModelIndex()), Qt.DisplayRole) for r in range(model.rowCount())]
         self.assertIn('public', schemas)
-        self.assertIn('CamelCaseSchema', schemas)
+        self.assertIn("CamelCase'singlequote'Schema", schemas)
         self.assertIn('qgis_test', schemas)
         self.assertIn('myNewSchema', schemas)
         self.assertIn('myNewSchema2', schemas)
@@ -172,7 +172,7 @@ def test_model_allow_empty(self):
         self.assertEqual(model.rowCount(), old_count + 3)
         schemas = [model.data(model.index(r, 0, QModelIndex()), Qt.DisplayRole) for r in range(model.rowCount())]
         self.assertIn('public', schemas)
-        self.assertIn('CamelCaseSchema', schemas)
+        self.assertIn("CamelCase'singlequote'Schema", schemas)
         self.assertIn('qgis_test', schemas)
         self.assertNotIn('myNewSchema', schemas)
         self.assertNotIn('myNewSchema2', schemas)
@@ -188,7 +188,7 @@ def test_model_allow_empty(self):
         self.assertEqual(model.rowCount(), old_count + 1)
         schemas = [model.data(model.index(r, 0, QModelIndex()), Qt.DisplayRole) for r in range(model.rowCount())]
         self.assertIn('public', schemas)
-        self.assertIn('CamelCaseSchema', schemas)
+        self.assertIn("CamelCase'singlequote'Schema", schemas)
         self.assertIn('qgis_test', schemas)
         self.assertNotIn('myNewSchema3', schemas)
         self.assertNotIn('myNewSchema4', schemas)

tests/testdata/provider/testdata_pg.sql

@@ -31,12 +31,12 @@ ALTER DEFAULT PRIVILEGES IN SCHEMA qgis_test GRANT ALL ON TABLES TO public;
 ALTER DEFAULT PRIVILEGES IN SCHEMA qgis_test GRANT ALL ON SEQUENCES TO public;
 
 
---- Create "CamelCaseSchema" schema
-DROP SCHEMA IF EXISTS "CamelCaseSchema" CASCADE;
-CREATE SCHEMA "CamelCaseSchema";
-GRANT ALL ON SCHEMA "CamelCaseSchema" TO public;
-ALTER DEFAULT PRIVILEGES IN SCHEMA "CamelCaseSchema" GRANT ALL ON TABLES TO public;
-ALTER DEFAULT PRIVILEGES IN SCHEMA "CamelCaseSchema" GRANT ALL ON SEQUENCES TO public;
+--- Create "CamelCase'singlequote'Schema" schema
+DROP SCHEMA IF EXISTS "CamelCase'singlequote'Schema" CASCADE;
+CREATE SCHEMA "CamelCase'singlequote'Schema";
+GRANT ALL ON SCHEMA "CamelCase'singlequote'Schema" TO public;
+ALTER DEFAULT PRIVILEGES IN SCHEMA "CamelCase'singlequote'Schema" GRANT ALL ON TABLES TO public;
+ALTER DEFAULT PRIVILEGES IN SCHEMA "CamelCase'singlequote'Schema" GRANT ALL ON SEQUENCES TO public;
 
 
 SET default_tablespace = '';