MSSQL revert geometryColumnTypes and homogenize

elpaso · elpaso · commit 9a53cf2a3ea7 · 2020-03-14T11:18:01.000+01:00
Other providers return an "invalid" col type from geometryColumnTypes
let's keep it that way (for now)
diff --git a/.ci/travis/linux/scripts/test_blacklist.txt b/.ci/travis/linux/scripts/test_blacklist.txt
@@ -21,3 +21,7 @@ qgis_openclutilstest
 # Relies on a broken/unreliable 3rd party service
 qgis_layerdefinition
 
+# MSSQL requires the MSSQL docker
+PyQgsProviderConnectionMssql
+
+
diff --git a/src/core/qgsabstractdatabaseproviderconnection.cpp b/src/core/qgsabstractdatabaseproviderconnection.cpp
@@ -193,10 +193,7 @@ void QgsAbstractDatabaseProviderConnection::TableProperty::addGeometryColumnType
 
 QList<QgsAbstractDatabaseProviderConnection::TableProperty::GeometryColumnType> QgsAbstractDatabaseProviderConnection::TableProperty::geometryColumnTypes() const
 {
-  if ( ! mGeometryColumn.isEmpty() )
-    return mGeometryColumnTypes;
-  else
-    return {};
+  return mGeometryColumnTypes;
 }
 
 
diff --git a/src/providers/mssql/qgsmssqlproviderconnection.cpp b/src/providers/mssql/qgsmssqlproviderconnection.cpp
@@ -391,6 +391,9 @@ QList<QgsMssqlProviderConnection::TableProperty> QgsMssqlProviderConnection::tab
     }
     else
     {
+      // Add an invalid column
+      table.addGeometryColumnType( QgsWkbTypes::Type::NoGeometry,
+                                   QgsCoordinateReferenceSystem() );
       table.setFlag( QgsMssqlProviderConnection::TableFlag::Aspatial );
     }
 
diff --git a/tests/src/python/test_qgsproviderconnection_base.py b/tests/src/python/test_qgsproviderconnection_base.py
@@ -201,7 +201,9 @@ def _test_operations(self, md, conn):
             self.assertEqual(table_property.geometryColumn(), '')
             self.assertEqual(table_property.defaultName(), 'myNewAspatialTable')
             cols = table_property.geometryColumnTypes()
-            self.assertEqual(cols, [])
+            # We always return geom col types, even when there is no geometry
+            self.assertEqual(cols[0].wkbType, QgsWkbTypes.NoGeometry)
+            self.assertFalse(cols[0].crs.isValid())
             self.assertFalse(table_property.flags() & QgsAbstractDatabaseProviderConnection.Raster)
             self.assertFalse(table_property.flags() & QgsAbstractDatabaseProviderConnection.Vector)
             self.assertTrue(table_property.flags() & QgsAbstractDatabaseProviderConnection.Aspatial)

Original file line number	Diff line number	Diff line change
`@@ -193,10 +193,7 @@ void QgsAbstractDatabaseProviderConnection::TableProperty::addGeometryColumnType`
`193`	`193`
`194`	`194`	`QList<QgsAbstractDatabaseProviderConnection::TableProperty::GeometryColumnType> QgsAbstractDatabaseProviderConnection::TableProperty::geometryColumnTypes() const`
`195`	`195`	`{`
`196`		`- if ( ! mGeometryColumn.isEmpty() )`
`197`		`- return mGeometryColumnTypes;`
`198`		`- else`
`199`		`- return {};`
	`196`	`+ return mGeometryColumnTypes;`
`200`	`197`	`}`
`201`	`198`
`202`	`199`
Original file line number	Diff line number	Diff line change
`@@ -391,6 +391,9 @@ QList<QgsMssqlProviderConnection::TableProperty> QgsMssqlProviderConnection::tab`
`391`	`391`	`}`
`392`	`392`	`else`
`393`	`393`	`{`
	`394`	`+ // Add an invalid column`
	`395`	`+ table.addGeometryColumnType( QgsWkbTypes::Type::NoGeometry,`
	`396`	`+ QgsCoordinateReferenceSystem() );`
`394`	`397`	`table.setFlag( QgsMssqlProviderConnection::TableFlag::Aspatial );`
`395`	`398`	`}`
`396`	`399`