[mssql] When moving tables, update geometry_columns table

Ensure that the geometry_columns metadata table is also updated
when moving SQL server tables via browser

Author: nyalldawson

src/providers/mssql/qgsmssqlproviderconnection.cpp

@@ -880,8 +880,15 @@ QString QgsMssqlProviderConnection::defaultPrimaryKeyColumnName() const
 
 void QgsMssqlProviderConnection::moveTableToSchema( const QString &sourceSchema, const QString &tableName, const QString &targetSchema ) const
 {
-  executeSqlPrivate( u"ALTER SCHEMA %1 TRANSFER %2.%3"_s
-                       .arg( QgsMssqlUtils::quotedIdentifier( targetSchema ), QgsMssqlUtils::quotedIdentifier( sourceSchema ), QgsMssqlUtils::quotedIdentifier( tableName ) ) );
+  QString sql = u"ALTER SCHEMA %1 TRANSFER %2.%3;\n"_s
+                  .arg( QgsMssqlUtils::quotedIdentifier( targetSchema ), QgsMssqlUtils::quotedIdentifier( sourceSchema ), QgsMssqlUtils::quotedIdentifier( tableName ) );
+  sql += u"if exists (select * from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'geometry_columns' )\n"
+         "UPDATE geometry_columns SET f_table_schema = %1 WHERE f_table_schema = %2 AND f_table_name = %3;"_s.arg(
+           QgsMssqlUtils::quotedValue( targetSchema ),
+           QgsMssqlUtils::quotedValue( sourceSchema ),
+           QgsMssqlUtils::quotedValue( tableName )
+         );
+  executeSqlPrivate( sql );
 }
 
 QgsAbstractDatabaseProviderConnection::SqlVectorLayerOptions QgsMssqlProviderConnection::sqlOptions( const QString &layerSource )

tests/src/python/test_qgsproviderconnection_mssql.py

@@ -551,6 +551,62 @@ def test_move_table_to_schema(self):
         table = conn.table("qgis_schema_test", "table_to_move")
         self.assertEqual(table.tableName(), "table_to_move")
 
+    def test_move_table_to_schema_geometry_columns(self):
+        """
+        Test that table can be moved to another schema when table is
+        in geometry_columns metadata table.
+        """
+
+        md = QgsProviderRegistry.instance().providerMetadata("mssql")
+        conn = md.createConnection(self.uri, {})
+
+        conn.dropVectorTable("qgis_test", "table_to_move_gc")
+        conn.createVectorTable(
+            "qgis_test",
+            "table_to_move_gc",
+            QgsFields(),
+            Qgis.WkbType.PolygonZ,
+            QgsCoordinateReferenceSystem(),
+            True,
+            {},
+        )
+        # make sure table is present in geometry_columns
+        res = conn.executeSql(
+            """SELECT f_table_schema, f_table_name from geometry_columns WHERE f_table_schema = 'qgis_test' AND f_table_name = 'table_to_move_gc';"""
+        )
+        self.assertEqual(res, [["qgis_test", "table_to_move_gc"]])
+
+        try:
+            conn.dropSchema("qgis_schema_test", True)
+        except QgsProviderConnectionException:
+            # likely schema does not exist
+            pass
+
+        conn.executeSql("CREATE SCHEMA qgis_schema_test;")
+
+        # test table exist
+        table = conn.table("qgis_test", "table_to_move_gc")
+        self.assertEqual(table.tableName(), "table_to_move_gc")
+
+        # move table to another schema
+        conn.moveTableToSchema(
+            "qgis_test",
+            "table_to_move_gc",
+            "qgis_schema_test",
+        )
+
+        vl = QgsVectorLayer(
+            conn.tableUri("qgis_schema_test", "table_to_move_gc"),
+            "table_to_move_gc",
+            "mssql",
+        )
+        self.assertTrue(vl.isValid())
+        self.assertEqual(vl.wkbType(), Qgis.WkbType.PolygonZ)
+        res = conn.executeSql(
+            """SELECT f_table_schema, f_table_name from geometry_columns WHERE  f_table_schema = 'qgis_schema_test' AND f_table_name = 'table_to_move_gc';"""
+        )
+        self.assertEqual(res, [["qgis_schema_test", "table_to_move_gc"]])
+
     def test_rename_field(self):
         """Test rename fields"""
         md = QgsProviderRegistry.instance().providerMetadata("mssql")