Fix import of shapefiles to postgres - regression introduced in 5abdfcb (#3652)

wonder-sk · wonder-sk · commit 5e4bb00fa3e1 · 2016-11-01T11:41:23.000+08:00
(cherry picked from commit a965a13)
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -3526,6 +3526,9 @@ QgsVectorLayerImport::ImportError QgsPostgresProvider::createEmptyLayer( const Q
         fldIdx = -1; // it is incremented in the for loop, i.e. restarts at 0
       }
     }
+
+    pkList = QStringList( primaryKey );
+    pkType = QStringList( "serial" );
   }
   else
   {
diff --git a/tests/src/python/test_provider_postgres.py b/tests/src/python/test_provider_postgres.py
@@ -471,17 +471,27 @@ def testImportKey(self):
 
         def testKey(lyr, key, kfnames):
             self.execSQLCommand('DROP TABLE IF EXISTS qgis_test.import_test')
-            uri = '%s table="qgis_test"."import_test" (g) key=\'%s\'' % (self.dbconn, key)
+            uri = '%s table="qgis_test"."import_test" (g)' % self.dbconn
+            if key is not None:
+                uri += ' key=\'%s\'' % key
             err = QgsVectorLayerImport.importLayer(lyr, uri, "postgres", lyr.crs())
             self.assertEqual(err[0], QgsVectorLayerImport.NoError,
                              'unexpected import error {0}'.format(err))
             olyr = QgsVectorLayer(uri, "y", "postgres")
             self.assertTrue(olyr.isValid())
             flds = lyr.fields()
             oflds = olyr.fields()
-            self.assertEquals(oflds.size(), flds.size())
-            for i in range(0, oflds.size()):
-                self.assertEqual(oflds[i].name(), flds[i].name())
+            if key is None:
+                # if the pkey was not given, it will create a pkey
+                self.assertEquals(oflds.size(), flds.size() + 1)
+                self.assertEquals(oflds[0].name(), kfnames[0])
+                for i in range(flds.size()):
+                    self.assertEqual(oflds[i + 1].name(), flds[i].name())
+            else:
+                # pkey was given, no extra field generated
+                self.assertEquals(oflds.size(), flds.size())
+                for i in range(oflds.size()):
+                    self.assertEqual(oflds[i].name(), flds[i].name())
             pks = olyr.pkAttributeList()
             self.assertEquals(len(pks), len(kfnames))
             for i in range(0, len(kfnames)):
@@ -491,6 +501,7 @@ def testKey(lyr, key, kfnames):
         testKey(lyr, '"f1"', ['f1'])
         testKey(lyr, '"f1","F2"', ['f1', 'F2'])
         testKey(lyr, '"f1","F2","f3"', ['f1', 'F2', 'f3'])
+        testKey(lyr, None, ['id'])
 
 
 class TestPyQgsPostgresProviderCompoundKey(unittest.TestCase, ProviderTestCase):

Original file line number	Diff line number	Diff line change
`@@ -3526,6 +3526,9 @@ QgsVectorLayerImport::ImportError QgsPostgresProvider::createEmptyLayer( const Q`
`3526`	`3526`	`fldIdx = -1; // it is incremented in the for loop, i.e. restarts at 0`
`3527`	`3527`	`}`
`3528`	`3528`	`}`
	`3529`	`+`
	`3530`	`+ pkList = QStringList( primaryKey );`
	`3531`	`+ pkType = QStringList( "serial" );`
`3529`	`3532`	`}`
`3530`	`3533`	`else`
`3531`	`3534`	`{`