Merge pull request #3098 from arnaud-morvan/postgresql_decimal_fields

jef-n · jef-n · commit d6ec868af173 · 2016-05-29T16:20:33.000+02:00
Keep numeric fields type, length and precision in postgresql provider
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -3336,16 +3336,16 @@ bool QgsPostgresProvider::convertField( QgsField &field, const QMap<QString, QVa
       break;
 
     case QVariant::Double:
-      if ( fieldSize > 18 )
+      if ( fieldPrec > 0 )
       {
         fieldType = "numeric";
-        fieldSize = -1;
       }
       else
       {
         fieldType = "float8";
+        fieldSize = -1;
+        fieldPrec = -1;
       }
-      fieldPrec = -1;
       break;
 
     default:

Original file line number	Diff line number	Diff line change
`@@ -3336,16 +3336,16 @@ bool QgsPostgresProvider::convertField( QgsField &field, const QMap<QString, QVa`
`3336`	`3336`	`break;`
`3337`	`3337`
`3338`	`3338`	`case QVariant::Double:`
`3339`		`- if ( fieldSize > 18 )`
	`3339`	`+ if ( fieldPrec > 0 )`
`3340`	`3340`	`{`
`3341`	`3341`	`fieldType = "numeric";`
`3342`		`- fieldSize = -1;`
`3343`	`3342`	`}`
`3344`	`3343`	`else`
`3345`	`3344`	`{`
`3346`	`3345`	`fieldType = "float8";`
	`3346`	`+ fieldSize = -1;`
	`3347`	`+ fieldPrec = -1;`
`3347`	`3348`	`}`
`3348`		`- fieldPrec = -1;`
`3349`	`3349`	`break;`
`3350`	`3350`
`3351`	`3351`	`default:`