Fix handling of longlong fields in memory provider

(cherry-picked from 98a216e)
qgis · Mar 4, 2016 · 2f5c193 · 2f5c193
1 parent c8950e2
commit 2f5c193
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/providers/memory/qgsmemoryprovider.cpp b/src/providers/memory/qgsmemoryprovider.cpp
@@ -108,8 +108,8 @@ QgsMemoryProvider::QgsMemoryProvider( const QString& uri )
   {
     QList<QgsField> attributes;
     QRegExp reFieldDef( "\\:"
-                        "(int|integer|real|double|string|date|time|datetime)" // type
-                        "(?:\\((\\d+)"                // length
+                        "(int|integer|long|int8|real|double|string|date|time|datetime)" // type
+                        "(?:\\((\\-?\\d+)"                // length
                         "(?:\\,(\\d+))?"                // precision
                         "\\))?"
                         "$", Qt::CaseInsensitive );
@@ -131,7 +131,13 @@ QgsMemoryProvider::QgsMemoryProvider( const QString& uri )
         {
           type = QVariant::Int;
           typeName = "integer";
-          length = 10;
+          length = -1;
+        }
+        else if ( typeName == "int8" || typeName == "long" )
+        {
+          type = QVariant::LongLong;
+          typeName = "int8";
+          length = -1;
         }
         else if ( typeName == "real" || typeName == "double" )
         {

diff --git a/tests/src/python/test_provider_memory.py b/tests/src/python/test_provider_memory.py
@@ -227,6 +227,7 @@ def testSaveFields(self):
 
         # Add some fields to the layer
         myFields = [QgsField('TestInt', QVariant.Int, 'integer', 2, 0),
+                    QgsField('TestLong', QVariant.LongLong, 'long', -1, 0),
                     QgsField('TestDbl', QVariant.Double, 'double', 8, 6),
                     QgsField('TestString', QVariant.String, 'string', 50, 0),
                     QgsField('TestDate', QVariant.Date, 'date'),