python/__init__.py

@@ -43,6 +43,10 @@
     def __nonzero__(self):
         return False
 
+    def __repr__(self):
+        return 'NULL'
+
     QPyNullVariant.__nonzero__ = MethodType(__nonzero__, None, QPyNullVariant)
+    QPyNullVariant.__repr__ = MethodType(__repr__, None, QPyNullVariant)
 except ImportError:
     pass

python/core/qgsfeature.sip

@@ -16,28 +16,24 @@ typedef QVector<QVariant> QgsAttributes;
     // Create the list.
     PyObject *l;
 
-    if ((l = PyList_New(sipCpp->size())) == NULL)
+    if ( ( l = PyList_New(sipCpp->size() ) ) == NULL )
         return NULL;
 
     // Set the list elements.
-    for (int i = 0; i < sipCpp->size(); ++i)
+    for ( int i = 0; i < sipCpp->size(); ++i )
     {
-      QVariant* v = new QVariant( sipCpp->at(i) );
+      QVariant* v = new QVariant( sipCpp->at( i ) );
       PyObject *tobj;
 
-      if ( v->isNull() )
-      {
-        Py_INCREF( Py_None );
-        tobj = Py_None;
-        delete v;
-      }
-      else if ((tobj = sipConvertFromNewType(v, sipType_QVariant,Py_None)) == NULL)
+      if ( ( tobj = sipConvertFromNewType( v, sipType_QVariant,Py_None ) ) == NULL )
       {
+        Py_DECREF( l );
         delete v;
+
         return NULL;
       }
 
-      PyList_SET_ITEM(l, i, tobj);
+      PyList_SET_ITEM( l, i, tobj );
     }
 
     return l;
@@ -132,17 +128,8 @@ class QgsFeature
   }
   else
   {
-    QVariant* v = new QVariant(attrs.at(a0));
-    if ( v->isNull() )
-    {
-      delete v;
-      Py_INCREF( Py_None );
-      sipRes = Py_None;
-    }
-    else
-    {
-      sipRes = sipConvertFromNewType( v, sipType_QVariant, Py_None );
-    }
+    QVariant* v = new QVariant( attrs.at(a0) );
+    sipRes = sipConvertFromNewType( v, sipType_QVariant, Py_None );
   }
 %End
 
@@ -156,14 +143,8 @@ class QgsFeature
   }
   else
   {
-    QVariant v = sipCpp->attribute(fieldIdx);
-    if ( v.isNull() )
-    {
-      Py_INCREF( Py_None );
-      sipRes = Py_None;
-    }
-    else
-      sipRes = sipConvertFromType( &v, sipType_QVariant, Py_None );
+    QVariant* v = new QVariant( sipCpp->attribute(fieldIdx) );
+    sipRes = sipConvertFromNewType( v, sipType_QVariant, Py_None );
   }
 %End
 
@@ -404,14 +385,8 @@ class QgsFeature
   }
   else
   {
-    QVariant v = sipCpp->attribute(fieldIdx);
-    if ( v.isNull() )
-    {
-      Py_INCREF( Py_None );
-      sipRes = Py_None;
-    }
-    else
-      sipRes = sipConvertFromType( &v, sipType_QVariant, Py_None );
+    QVariant* v = new QVariant( sipCpp->attribute(fieldIdx) );
+    sipRes = sipConvertFromNewType( v, sipType_QVariant, Py_None );
   }
 %End
     /** Utility method to get attribute index from name. Returns -1 if field does not exist or field map is not associated.

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 )

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 );
 
     /**