Exclude the geometry column when identifying the type

szekerest · NathanW2 · commit 142544959e96 · 2012-03-28T21:56:30.000+10:00
diff --git a/src/providers/mssql/qgsmssqlprovider.cpp b/src/providers/mssql/qgsmssqlprovider.cpp
@@ -317,14 +317,14 @@ void QgsMssqlProvider::loadFields()
     while ( mQuery.next() )
     {
       QString sqlTypeName = mQuery.value( 5 ).toString();
-      QVariant::Type sqlType = DecodeSqlType( sqlTypeName );
       if ( sqlTypeName == "geometry" || sqlTypeName == "geography" )
       {
         mGeometryColName = mQuery.value( 3 ).toString();
         mGeometryColType = sqlTypeName;
       }
       else
       {
+        QVariant::Type sqlType = DecodeSqlType( sqlTypeName );
         if ( sqlTypeName == "int identity" || sqlTypeName == "bigint identity" )
           mFidColName = mQuery.value( 3 ).toString();
         mAttributeFields.insert(

Original file line number	Diff line number	Diff line change
`@@ -317,14 +317,14 @@ void QgsMssqlProvider::loadFields()`
`317`	`317`	`while ( mQuery.next() )`
`318`	`318`	`{`
`319`	`319`	`QString sqlTypeName = mQuery.value( 5 ).toString();`
`320`		`- QVariant::Type sqlType = DecodeSqlType( sqlTypeName );`
`321`	`320`	`if ( sqlTypeName == "geometry" \|\| sqlTypeName == "geography" )`
`322`	`321`	`{`
`323`	`322`	`mGeometryColName = mQuery.value( 3 ).toString();`
`324`	`323`	`mGeometryColType = sqlTypeName;`
`325`	`324`	`}`
`326`	`325`	`else`
`327`	`326`	`{`
	`327`	`+ QVariant::Type sqlType = DecodeSqlType( sqlTypeName );`
`328`	`328`	`if ( sqlTypeName == "int identity" \|\| sqlTypeName == "bigint identity" )`
`329`	`329`	`mFidColName = mQuery.value( 3 ).toString();`
`330`	`330`	`mAttributeFields.insert(`