Merge pull request #1407 from dbaston/master

jef-n · jef-n · commit 45ebe5372e87 · 2014-06-17T18:37:29.000+02:00
postgres provider: avoid overflow from casting index oid to integer (fixes #9005)
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -1112,7 +1112,7 @@ bool QgsPostgresProvider::determinePrimaryKey()
     else
     {
       // have a primary key or unique index
-      int indrelid = res.PQgetvalue( 0, 0 ).toInt();
+      QString indrelid = res.PQgetvalue( 0, 0 );
       sql = QString( "SELECT attname FROM pg_index,pg_attribute WHERE indexrelid=%1 AND indrelid=attrelid AND pg_attribute.attnum=any(pg_index.indkey)" ).arg( indrelid );
 
       QgsDebugMsg( "Retrieving key columns: " + sql );

Original file line number	Diff line number	Diff line change
`@@ -1112,7 +1112,7 @@ bool QgsPostgresProvider::determinePrimaryKey()`
`1112`	`1112`	`else`
`1113`	`1113`	`{`
`1114`	`1114`	`// have a primary key or unique index`
`1115`		`- int indrelid = res.PQgetvalue( 0, 0 ).toInt();`
	`1115`	`+ QString indrelid = res.PQgetvalue( 0, 0 );`
`1116`	`1116`	`sql = QString( "SELECT attname FROM pg_index,pg_attribute WHERE indexrelid=%1 AND indrelid=attrelid AND pg_attribute.attnum=any(pg_index.indkey)" ).arg( indrelid );`
`1117`	`1117`
`1118`	`1118`	`QgsDebugMsg( "Retrieving key columns: " + sql );`