Importing a layer, create an autoincremental integer pk if either no pk was passed or it's an integer field

brushtyler · brushtyler · commit 7d79a73f587a · 2015-09-03T01:20:19.000+02:00
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -2939,14 +2939,7 @@ bool QgsPostgresProvider::convertField( QgsField &field, const QMap<QString, QVa
       break;
 
     case QVariant::Int:
-      if ( fieldPrec < 10 )
-      {
-        fieldType = "int4";
-      }
-      else
-      {
-        fieldType = "numeric";
-      }
+      fieldType = "int4";
       fieldPrec = 0;
       break;
 
@@ -3054,7 +3047,8 @@ QgsVectorLayerImport::ImportError QgsPostgresProvider::createEmptyLayer(
     }
   }
 
-  // if the field doesn't not exist yet, create it as a serial field
+  // if the pk field doesn't exist yet, create a serial pk field
+  // as it's autoincremental
   if ( primaryKeyType.isEmpty() )
   {
     primaryKeyType = "serial";
@@ -3066,6 +3060,19 @@ QgsVectorLayerImport::ImportError QgsPostgresProvider::createEmptyLayer(
     }
 #endif
   }
+  else
+  {
+      // if the pk field's type is one of the postgres integer types,
+      // use the equivalent autoincremental type (serialN)
+      if ( primaryKeyType == "int2" || primaryKeyType == "int4" )
+      {
+        primaryKeyType = "serial";
+      }
+      else if ( primaryKeyType == "int8" )
+      {
+        primaryKeyType = "serial8";
+      }
+  }
 
   try
   {
diff --git a/src/providers/spatialite/qgsspatialiteprovider.cpp b/src/providers/spatialite/qgsspatialiteprovider.cpp
@@ -175,17 +175,20 @@ QgsSpatiaLiteProvider::createEmptyLayer(
       }
     }
 
-    // if the field doesn't not exist yet, create it as a int field
+    // if the pk field doesn't exist yet, create an integer pk field
+    // as it's autoincremental
     if ( primaryKeyType.isEmpty() )
     {
       primaryKeyType = "INTEGER";
-#if 0 // TODO
-      // check the feature count to choose if create a bigint pk field
-      if ( layer->featureCount() > 0xFFFFFF )
-      {
-        primaryKeyType = "BIGINT";
-      }
-#endif
+    }
+    else
+    {
+        // if the pk field's type is bigint, use the autoincremental
+        // integer type instead
+        if ( primaryKeyType == "BIGINT" )
+        {
+          primaryKeyType = "INTEGER";
+        }
     }
 
     try
