[spatialite] Represent NULL attributes as QVariant/NULL

m-kuhn · m-kuhn · commit 425b8b67d7a2 · 2013-08-28T13:15:08.000+02:00
Instead of QVariant/Invalid
diff --git a/src/providers/spatialite/qgsspatialitefeatureiterator.cpp b/src/providers/spatialite/qgsspatialitefeatureiterator.cpp
@@ -325,14 +325,14 @@ bool QgsSpatiaLiteFeatureIterator::getFeature( sqlite3_stmt *stmt, QgsFeature &f
     else
     {
       int attrIndex = subsetAttributes ? mRequest.subsetOfAttributes()[ic-1] : ic - 1;
-      feature.setAttribute( attrIndex, getFeatureAttribute( stmt, ic ) );
+      feature.setAttribute( attrIndex, getFeatureAttribute( stmt, ic, P->attributeFields[attrIndex].type() ) );
     }
   }
 
   return true;
 }
 
-QVariant QgsSpatiaLiteFeatureIterator::getFeatureAttribute( sqlite3_stmt* stmt, int ic )
+QVariant QgsSpatiaLiteFeatureIterator::getFeatureAttribute( sqlite3_stmt* stmt, int ic, const QVariant::Type& type )
 {
   if ( sqlite3_column_type( stmt, ic ) == SQLITE_INTEGER )
   {
@@ -354,7 +354,7 @@ QVariant QgsSpatiaLiteFeatureIterator::getFeatureAttribute( sqlite3_stmt* stmt,
   }
 
   // assuming NULL
-  return QVariant();
+  return QVariant( type );
 }
 
 void QgsSpatiaLiteFeatureIterator::getFeatureGeometry( sqlite3_stmt* stmt, int ic, QgsFeature& feature )
diff --git a/src/providers/spatialite/qgsspatialitefeatureiterator.h b/src/providers/spatialite/qgsspatialitefeatureiterator.h
@@ -51,7 +51,7 @@ class QgsSpatiaLiteFeatureIterator : public QgsAbstractFeatureIterator
     QString quotedPrimaryKey();
     bool getFeature( sqlite3_stmt *stmt, QgsFeature &feature );
     QString fieldName( const QgsField& fld );
-    QVariant getFeatureAttribute( sqlite3_stmt* stmt, int ic );
+    QVariant getFeatureAttribute( sqlite3_stmt* stmt, int ic, const QVariant::Type& type );
     void getFeatureGeometry( sqlite3_stmt* stmt, int ic, QgsFeature& feature );
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -325,14 +325,14 @@ bool QgsSpatiaLiteFeatureIterator::getFeature( sqlite3_stmt *stmt, QgsFeature &f`
`325`	`325`	`else`
`326`	`326`	`{`
`327`	`327`	`int attrIndex = subsetAttributes ? mRequest.subsetOfAttributes()[ic-1] : ic - 1;`
`328`		`- feature.setAttribute( attrIndex, getFeatureAttribute( stmt, ic ) );`
	`328`	`+ feature.setAttribute( attrIndex, getFeatureAttribute( stmt, ic, P->attributeFields[attrIndex].type() ) );`
`329`	`329`	`}`
`330`	`330`	`}`
`331`	`331`
`332`	`332`	`return true;`
`333`	`333`	`}`
`334`	`334`
`335`		`-QVariant QgsSpatiaLiteFeatureIterator::getFeatureAttribute( sqlite3_stmt* stmt, int ic )`
	`335`	`+QVariant QgsSpatiaLiteFeatureIterator::getFeatureAttribute( sqlite3_stmt* stmt, int ic, const QVariant::Type& type )`
`336`	`336`	`{`
`337`	`337`	`if ( sqlite3_column_type( stmt, ic ) == SQLITE_INTEGER )`
`338`	`338`	`{`
`@@ -354,7 +354,7 @@ QVariant QgsSpatiaLiteFeatureIterator::getFeatureAttribute( sqlite3_stmt* stmt,`
`354`	`354`	`}`
`355`	`355`
`356`	`356`	`// assuming NULL`
`357`		`- return QVariant();`
	`357`	`+ return QVariant( type );`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`void QgsSpatiaLiteFeatureIterator::getFeatureGeometry( sqlite3_stmt* stmt, int ic, QgsFeature& feature )`