QgsVectorDataProvider::supportedType(): use -1 as the value for unspecified length/width (this is the default in QgsField constructor and QgsVectorDataProvider::NativeType())

rouault · slarosa · commit 00c301e5b28f · 2018-07-06T13:23:14.000+02:00
diff --git a/src/core/qgsvectordataprovider.cpp b/src/core/qgsvectordataprovider.cpp
@@ -309,10 +309,10 @@ bool QgsVectorDataProvider::supportedType( const QgsField &field ) const
     if ( field.type() != nativeType.mType )
       continue;
 
-    if ( field.length() == -1 )
+    if ( field.length() <= 0 )
     {
       // source length unlimited
-      if ( nativeType.mMinLen > -1 || nativeType.mMaxLen > -1 )
+      if ( nativeType.mMinLen > 0 || nativeType.mMaxLen > 0 )
       {
         // destination limited
         continue;
@@ -321,18 +321,18 @@ bool QgsVectorDataProvider::supportedType( const QgsField &field ) const
     else
     {
       // source length limited
-      if ( nativeType.mMinLen > -1 && nativeType.mMaxLen > -1 &&
-           ( field.length() < nativeType.mMinLen || field.length() > nativeType.mMaxLen ) )
+      if ( ( nativeType.mMinLen > 0 && field.length() < nativeType.mMinLen ) ||
+           ( nativeType.mMaxLen > 0 && field.length() > nativeType.mMaxLen ) )
       {
         // source length exceeds destination limits
         continue;
       }
     }
 
-    if ( field.precision() == -1 )
+    if ( field.precision() <= 0 )
     {
       // source precision unlimited / n/a
-      if ( nativeType.mMinPrec > -1 || nativeType.mMaxPrec > -1 )
+      if ( nativeType.mMinPrec > 0 || nativeType.mMaxPrec > 0 )
       {
         // destination limited
         continue;
@@ -341,8 +341,8 @@ bool QgsVectorDataProvider::supportedType( const QgsField &field ) const
     else
     {
       // source precision unlimited / n/a
-      if ( nativeType.mMinPrec > -1 && nativeType.mMaxPrec > -1 &&
-           ( field.precision() < nativeType.mMinPrec || field.precision() > nativeType.mMaxPrec ) )
+      if ( ( nativeType.mMinPrec > 0 && field.precision() < nativeType.mMinPrec ) ||
+           ( nativeType.mMaxPrec > 0 && field.precision() > nativeType.mMaxPrec ) )
       {
         // source precision exceeds destination limits
         continue;

Original file line number	Diff line number	Diff line change
`@@ -309,10 +309,10 @@ bool QgsVectorDataProvider::supportedType( const QgsField &field ) const`
`309`	`309`	`if ( field.type() != nativeType.mType )`
`310`	`310`	`continue;`
`311`	`311`
`312`		`- if ( field.length() == -1 )`
	`312`	`+ if ( field.length() <= 0 )`
`313`	`313`	`{`
`314`	`314`	`// source length unlimited`
`315`		`- if ( nativeType.mMinLen > -1 \|\| nativeType.mMaxLen > -1 )`
	`315`	`+ if ( nativeType.mMinLen > 0 \|\| nativeType.mMaxLen > 0 )`
`316`	`316`	`{`
`317`	`317`	`// destination limited`
`318`	`318`	`continue;`
`@@ -321,18 +321,18 @@ bool QgsVectorDataProvider::supportedType( const QgsField &field ) const`
`321`	`321`	`else`
`322`	`322`	`{`
`323`	`323`	`// source length limited`
`324`		`- if ( nativeType.mMinLen > -1 && nativeType.mMaxLen > -1 &&`
`325`		`- ( field.length() < nativeType.mMinLen \|\| field.length() > nativeType.mMaxLen ) )`
	`324`	`+ if ( ( nativeType.mMinLen > 0 && field.length() < nativeType.mMinLen ) \|\|`
	`325`	`+ ( nativeType.mMaxLen > 0 && field.length() > nativeType.mMaxLen ) )`
`326`	`326`	`{`
`327`	`327`	`// source length exceeds destination limits`
`328`	`328`	`continue;`
`329`	`329`	`}`
`330`	`330`	`}`
`331`	`331`
`332`		`- if ( field.precision() == -1 )`
	`332`	`+ if ( field.precision() <= 0 )`
`333`	`333`	`{`
`334`	`334`	`// source precision unlimited / n/a`
`335`		`- if ( nativeType.mMinPrec > -1 \|\| nativeType.mMaxPrec > -1 )`
	`335`	`+ if ( nativeType.mMinPrec > 0 \|\| nativeType.mMaxPrec > 0 )`
`336`	`336`	`{`
`337`	`337`	`// destination limited`
`338`	`338`	`continue;`
`@@ -341,8 +341,8 @@ bool QgsVectorDataProvider::supportedType( const QgsField &field ) const`
`341`	`341`	`else`
`342`	`342`	`{`
`343`	`343`	`// source precision unlimited / n/a`
`344`		`- if ( nativeType.mMinPrec > -1 && nativeType.mMaxPrec > -1 &&`
`345`		`- ( field.precision() < nativeType.mMinPrec \|\| field.precision() > nativeType.mMaxPrec ) )`
	`344`	`+ if ( ( nativeType.mMinPrec > 0 && field.precision() < nativeType.mMinPrec ) \|\|`
	`345`	`+ ( nativeType.mMaxPrec > 0 && field.precision() > nativeType.mMaxPrec ) )`
`346`	`346`	`{`
`347`	`347`	`// source precision exceeds destination limits`
`348`	`348`	`continue;`