use both schema and table name retrieving oid, to fix #3329

brushtyler · brushtyler · commit 650d97b0d306 · 2010-12-15T21:59:30.000Z
fixed endian deduction corrupted in r13340 git-svn-id: http://svn.osgeo.org/qgis/trunk@14919 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -2957,8 +2957,10 @@ bool QgsPostgresProvider::deduceEndian()
     if ( i < PQnfields( res ) )
     {
       // get the table name
-      res = connectionRO->PQexec( QString( "SELECT relname FROM pg_class WHERE oid=%1" ).arg( oidValue ) );
-      query = QString::fromUtf8( PQgetvalue( res, 0, 0 ) );
+      res = connectionRO->PQexec( QString( "SELECT pg_namespace.nspname,pg_class.relname FROM pg_class,pg_namespace WHERE pg_class.relnamespace=pg_namespace.oid AND pg_class.oid=%1" ).arg( oidValue ) );
+      QString schemaName = QString::fromUtf8( PQgetvalue( res, 0, 0 ) );
+      QString tableName = QString::fromUtf8( PQgetvalue( res, 0, 1 ) );
+      query = quotedIdentifier( schemaName ) + "." + quotedIdentifier( tableName );
     }
     else
     {
@@ -2972,6 +2974,7 @@ bool QgsPostgresProvider::deduceEndian()
     Result oidResult = connectionRO->PQexec( firstOid );
     // get the int value from a "normal" select
     oidValue = QString::fromUtf8( PQgetvalue( oidResult, 0, 0 ) );
+    query = mQuery;
   }
 
   QgsDebugMsg( "Creating binary cursor" );

Original file line number	Diff line number	Diff line change
`@@ -2957,8 +2957,10 @@ bool QgsPostgresProvider::deduceEndian()`
`2957`	`2957`	`if ( i < PQnfields( res ) )`
`2958`	`2958`	`{`
`2959`	`2959`	`// get the table name`
`2960`		`- res = connectionRO->PQexec( QString( "SELECT relname FROM pg_class WHERE oid=%1" ).arg( oidValue ) );`
`2961`		`- query = QString::fromUtf8( PQgetvalue( res, 0, 0 ) );`
	`2960`	`+ res = connectionRO->PQexec( QString( "SELECT pg_namespace.nspname,pg_class.relname FROM pg_class,pg_namespace WHERE pg_class.relnamespace=pg_namespace.oid AND pg_class.oid=%1" ).arg( oidValue ) );`
	`2961`	`+ QString schemaName = QString::fromUtf8( PQgetvalue( res, 0, 0 ) );`
	`2962`	`+ QString tableName = QString::fromUtf8( PQgetvalue( res, 0, 1 ) );`
	`2963`	`+ query = quotedIdentifier( schemaName ) + "." + quotedIdentifier( tableName );`
`2962`	`2964`	`}`
`2963`	`2965`	`else`
`2964`	`2966`	`{`
`@@ -2972,6 +2974,7 @@ bool QgsPostgresProvider::deduceEndian()`
`2972`	`2974`	`Result oidResult = connectionRO->PQexec( firstOid );`
`2973`	`2975`	`// get the int value from a "normal" select`
`2974`	`2976`	`oidValue = QString::fromUtf8( PQgetvalue( oidResult, 0, 0 ) );`
	`2977`	`+ query = mQuery;`
`2975`	`2978`	`}`
`2976`	`2979`
`2977`	`2980`	`QgsDebugMsg( "Creating binary cursor" );`