Merge pull request #445 from szekerest/master

MSSQL: Fix for the problem with the length of the numeric fields (Fix #7249)
qgis · Feb 27, 2013 · b5dc778 · b5dc778
2 parents 84db88b + f5d81ae
commit b5dc778
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/src/providers/mssql/qgsmssqlprovider.cpp b/src/providers/mssql/qgsmssqlprovider.cpp
@@ -370,12 +370,21 @@ void QgsMssqlProvider::loadFields()
         {
           pkCandidates << query.value( 3 ).toString();
         }
-        mAttributeFields.append(
-          QgsField(
-            query.value( 3 ).toString(), sqlType,
-            sqlTypeName,
-            query.value( 7 ).toInt(),
-            query.value( 6 ).toInt() ) );
+        if ( sqlType == QVariant::String )
+        {
+            mAttributeFields.append(
+              QgsField(
+                query.value( 3 ).toString(), sqlType,
+                sqlTypeName,
+                query.value( 7 ).toInt() ) );
+        }
+        else
+        {
+            mAttributeFields.append(
+              QgsField(
+                query.value( 3 ).toString(), sqlType,
+                sqlTypeName ) );
+        }
 
         if ( !query.value( 12 ).isNull() )
         {