Fix primary key search

manisandro · jef-n · commit f528d2b669d7 · 2015-04-26T15:24:57.000+02:00
(cherry picked from commit 265c253)
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -2968,7 +2968,7 @@ QgsVectorLayerImport::ImportError QgsPostgresProvider::createEmptyLayer(
       {
         // it already exists, try again with a new name
         primaryKey = QString( "%1_%2" ).arg( pk ).arg( index++ );
-        fldIdx = 0;
+        fldIdx = -1; // it is incremented in the for loop, i.e. restarts at 0
       }
     }
   }
diff --git a/src/providers/spatialite/qgsspatialiteprovider.cpp b/src/providers/spatialite/qgsspatialiteprovider.cpp
@@ -157,7 +157,7 @@ QgsSpatiaLiteProvider::createEmptyLayer(
         {
           // it already exists, try again with a new name
           primaryKey = QString( "%1_%2" ).arg( pk ).arg( index++ );
-          fldIdx = 0;
+          fldIdx = -1; // it is incremented in the for loop, i.e. restarts at 0
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -2968,7 +2968,7 @@ QgsVectorLayerImport::ImportError QgsPostgresProvider::createEmptyLayer(`
`2968`	`2968`	`{`
`2969`	`2969`	`// it already exists, try again with a new name`
`2970`	`2970`	`primaryKey = QString( "%1_%2" ).arg( pk ).arg( index++ );`
`2971`		`- fldIdx = 0;`
	`2971`	`+ fldIdx = -1; // it is incremented in the for loop, i.e. restarts at 0`
`2972`	`2972`	`}`
`2973`	`2973`	`}`
`2974`	`2974`	`}`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ QgsSpatiaLiteProvider::createEmptyLayer(`
`157`	`157`	`{`
`158`	`158`	`// it already exists, try again with a new name`
`159`	`159`	`primaryKey = QString( "%1_%2" ).arg( pk ).arg( index++ );`
`160`		`- fldIdx = 0;`
	`160`	`+ fldIdx = -1; // it is incremented in the for loop, i.e. restarts at 0`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`	`}`