[MSSQL] Correctly interpret geometry-type setting

Simon South · nyalldawson · commit 25587f64b1a0 · 2018-08-10T10:43:54.000+10:00
Interpret a table's geometry type (as selected in the Data Source Manager) as a value from the QgsWkbTypes::Type enum, matching the values used to populate the combo box in QgsMssqlSourceSelectDelegate::createEditor(). This allows an empty table whose geometry type is set to "Polygon" to be selected and added using the dialog. Fixes #19578. (cherry-picked from a9ca69b)
diff --git a/src/providers/mssql/qgsmssqltablemodel.cpp b/src/providers/mssql/qgsmssqltablemodel.cpp
@@ -321,11 +321,11 @@ bool QgsMssqlTableModel::setData( const QModelIndex &idx, const QVariant &value,
 
   if ( idx.column() == DbtmType || idx.column() == DbtmSrid || idx.column() == DbtmPkCol )
   {
-    QgsWkbTypes::GeometryType geomType = ( QgsWkbTypes::GeometryType ) idx.sibling( idx.row(), DbtmType ).data( Qt::UserRole + 2 ).toInt();
+    QgsWkbTypes::Type wkbType = ( QgsWkbTypes::Type ) idx.sibling( idx.row(), DbtmType ).data( Qt::UserRole + 2 ).toInt();
 
-    bool ok = geomType != QgsWkbTypes::UnknownGeometry;
+    bool ok = wkbType != QgsWkbTypes::Unknown;
 
-    if ( ok && geomType != QgsWkbTypes::NullGeometry )
+    if ( ok && wkbType != QgsWkbTypes::NoGeometry )
       idx.sibling( idx.row(), DbtmSrid ).data().toInt( &ok );
 
     QStringList pkCols = idx.sibling( idx.row(), DbtmPkCol ).data( Qt::UserRole + 1 ).toStringList();
