minor pg provider fix: oid==0 is invalid

jef · jef · commit 4a507e40a461 · 2010-05-05T08:39:31.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13424 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -853,7 +853,7 @@ bool QgsPostgresProvider::loadFields()
     QString fieldElem = QString::fromUtf8( PQgetvalue( oidResult, 0, 2 ) );
     int fieldSize = QString::fromUtf8( PQgetvalue( oidResult, 0, 3 ) ).toInt();
 
-    if ( tableoid >= 0 )
+    if ( tableoid > 0 )
     {
       sql = QString( "SELECT attnum FROM pg_attribute WHERE attrelid=%1 AND attname=%2" )
             .arg( tableoid ).arg( quotedValue( fieldName ) );
@@ -2940,7 +2940,7 @@ bool QgsPostgresProvider::deduceEndian()
     for ( i = 0; i < PQnfields( res ); i++ )
     {
       int tableoid = PQftable( res, i );
-      if ( tableoid >= 0 )
+      if ( tableoid > 0 )
       {
         oidValue = QString::number( tableoid );
         break;
@@ -3016,31 +3016,31 @@ bool QgsPostgresProvider::getGeometryDetails()
     Result result = connectionRO->PQexec( sql );
     if ( PGRES_TUPLES_OK == PQresultStatus( result ) )
     {
-      Oid tableOid = PQftable( result, 0 );
+      Oid tableoid = PQftable( result, 0 );
       int column = PQftablecol( result, 0 );
 
       result = connectionRO->PQexec( sql );
-      if ( tableOid >= 0 && PGRES_TUPLES_OK == PQresultStatus( result ) )
+      if ( tableoid > 0 && PGRES_TUPLES_OK == PQresultStatus( result ) )
       {
-        sql = 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( tableOid );
+        sql = 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( tableoid );
         result = connectionRO->PQexec( sql );
 
         if ( PGRES_TUPLES_OK == PQresultStatus( result ) && 1 == PQntuples( result ) )
         {
           schemaName = QString::fromUtf8( PQgetvalue( result, 0, 0 ) );
           tableName = QString::fromUtf8( PQgetvalue( result, 0, 1 ) );
 
-          sql = QString( "SELECT attname FROM pg_attribute WHERE attrelid=%1 AND attnum=%2" ).arg( tableOid ).arg( column );
+          sql = QString( "SELECT attname FROM pg_attribute WHERE attrelid=%1 AND attnum=%2" ).arg( tableoid ).arg( column );
           result = connectionRO->PQexec( sql );
           if ( PGRES_TUPLES_OK == PQresultStatus( result ) && 1 == PQntuples( result ) )
           {
             geomCol = QString::fromUtf8( PQgetvalue( result, 0, 0 ) );
           }
-					else
-					{
-						schemaName = mSchemaName;
-						tableName = mTableName;
-					}
+          else
+          {
+            schemaName = mSchemaName;
+            tableName = mTableName;
+          }
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -853,7 +853,7 @@ bool QgsPostgresProvider::loadFields()`
`853`	`853`	`QString fieldElem = QString::fromUtf8( PQgetvalue( oidResult, 0, 2 ) );`
`854`	`854`	`int fieldSize = QString::fromUtf8( PQgetvalue( oidResult, 0, 3 ) ).toInt();`
`855`	`855`
`856`		`- if ( tableoid >= 0 )`
	`856`	`+ if ( tableoid > 0 )`
`857`	`857`	`{`
`858`	`858`	`sql = QString( "SELECT attnum FROM pg_attribute WHERE attrelid=%1 AND attname=%2" )`
`859`	`859`	`.arg( tableoid ).arg( quotedValue( fieldName ) );`
`@@ -2940,7 +2940,7 @@ bool QgsPostgresProvider::deduceEndian()`
`2940`	`2940`	`for ( i = 0; i < PQnfields( res ); i++ )`
`2941`	`2941`	`{`
`2942`	`2942`	`int tableoid = PQftable( res, i );`
`2943`		`- if ( tableoid >= 0 )`
	`2943`	`+ if ( tableoid > 0 )`
`2944`	`2944`	`{`
`2945`	`2945`	`oidValue = QString::number( tableoid );`
`2946`	`2946`	`break;`
`@@ -3016,31 +3016,31 @@ bool QgsPostgresProvider::getGeometryDetails()`
`3016`	`3016`	`Result result = connectionRO->PQexec( sql );`
`3017`	`3017`	`if ( PGRES_TUPLES_OK == PQresultStatus( result ) )`
`3018`	`3018`	`{`
`3019`		`- Oid tableOid = PQftable( result, 0 );`
	`3019`	`+ Oid tableoid = PQftable( result, 0 );`
`3020`	`3020`	`int column = PQftablecol( result, 0 );`
`3021`	`3021`
`3022`	`3022`	`result = connectionRO->PQexec( sql );`
`3023`		`- if ( tableOid >= 0 && PGRES_TUPLES_OK == PQresultStatus( result ) )`
	`3023`	`+ if ( tableoid > 0 && PGRES_TUPLES_OK == PQresultStatus( result ) )`
`3024`	`3024`	`{`
`3025`		`- sql = 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( tableOid );`
	`3025`	`+ sql = 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( tableoid );`
`3026`	`3026`	`result = connectionRO->PQexec( sql );`
`3027`	`3027`
`3028`	`3028`	`if ( PGRES_TUPLES_OK == PQresultStatus( result ) && 1 == PQntuples( result ) )`
`3029`	`3029`	`{`
`3030`	`3030`	`schemaName = QString::fromUtf8( PQgetvalue( result, 0, 0 ) );`
`3031`	`3031`	`tableName = QString::fromUtf8( PQgetvalue( result, 0, 1 ) );`
`3032`	`3032`
`3033`		`- sql = QString( "SELECT attname FROM pg_attribute WHERE attrelid=%1 AND attnum=%2" ).arg( tableOid ).arg( column );`
	`3033`	`+ sql = QString( "SELECT attname FROM pg_attribute WHERE attrelid=%1 AND attnum=%2" ).arg( tableoid ).arg( column );`
`3034`	`3034`	`result = connectionRO->PQexec( sql );`
`3035`	`3035`	`if ( PGRES_TUPLES_OK == PQresultStatus( result ) && 1 == PQntuples( result ) )`
`3036`	`3036`	`{`
`3037`	`3037`	`geomCol = QString::fromUtf8( PQgetvalue( result, 0, 0 ) );`
`3038`	`3038`	`}`
`3039`		`- else`
`3040`		`- {`
`3041`		`- schemaName = mSchemaName;`
`3042`		`- tableName = mTableName;`
`3043`		`- }`
	`3039`	`+ else`
	`3040`	`+ {`
	`3041`	`+ schemaName = mSchemaName;`
	`3042`	`+ tableName = mTableName;`
	`3043`	`+ }`
`3044`	`3044`	`}`
`3045`	`3045`	`}`
`3046`	`3046`	`}`