postgres provider fixes

jef-n · jef-n · commit ff6a46e8ef66 · 2012-01-10T22:12:53.000+01:00
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -453,9 +453,11 @@ bool QgsPostgresProvider::getFeature( QgsPostgresResult &queryResult, int row, b
     switch ( mPrimaryKeyType )
     {
       case pktOid:
-      case pktInt:
       case pktTid:
+      case pktInt:
         fid = mConnectionRO->getBinaryInt( queryResult, row, col++ );
+        if ( mPrimaryKeyType == pktInt && fetchAttributes.contains( mPrimaryKeyAttrs[0] ) )
+          feature.addAttribute( mPrimaryKeyAttrs[0], fid );
         break;
 
       case pktFidMap:
@@ -2658,7 +2660,7 @@ bool QgsPostgresProvider::getGeometryDetails()
 
     if ( srid.isEmpty() )
     {
-      srid = layerProperty.srid;
+      srid = QString::number( layerProperty.srid );
     }
 
     if ( type.isEmpty() && !type.contains( "," ) )
@@ -2698,7 +2700,6 @@ bool QgsPostgresProvider::getGeometryDetails()
       mEnabledCapabilities &= ~( QgsVectorDataProvider::ChangeGeometries | QgsVectorDataProvider::AddFeatures );
     }
 
-
     QgsDebugMsg( "Detected SRID is " + mDetectedSrid );
     QgsDebugMsg( "Requested SRID is " + mRequestedSrid );
     QgsDebugMsg( "Detected type is " + QString::number( mDetectedGeomType ) );

Original file line number	Diff line number	Diff line change
`@@ -453,9 +453,11 @@ bool QgsPostgresProvider::getFeature( QgsPostgresResult &queryResult, int row, b`
`453`	`453`	`switch ( mPrimaryKeyType )`
`454`	`454`	`{`
`455`	`455`	`case pktOid:`
`456`		`- case pktInt:`
`457`	`456`	`case pktTid:`
	`457`	`+ case pktInt:`
`458`	`458`	`fid = mConnectionRO->getBinaryInt( queryResult, row, col++ );`
	`459`	`+ if ( mPrimaryKeyType == pktInt && fetchAttributes.contains( mPrimaryKeyAttrs[0] ) )`
	`460`	`+ feature.addAttribute( mPrimaryKeyAttrs[0], fid );`
`459`	`461`	`break;`
`460`	`462`
`461`	`463`	`case pktFidMap:`
`@@ -2658,7 +2660,7 @@ bool QgsPostgresProvider::getGeometryDetails()`
`2658`	`2660`
`2659`	`2661`	`if ( srid.isEmpty() )`
`2660`	`2662`	`{`
`2661`		`- srid = layerProperty.srid;`
	`2663`	`+ srid = QString::number( layerProperty.srid );`
`2662`	`2664`	`}`
`2663`	`2665`
`2664`	`2666`	`if ( type.isEmpty() && !type.contains( "," ) )`
`@@ -2698,7 +2700,6 @@ bool QgsPostgresProvider::getGeometryDetails()`
`2698`	`2700`	`mEnabledCapabilities &= ~( QgsVectorDataProvider::ChangeGeometries \| QgsVectorDataProvider::AddFeatures );`
`2699`	`2701`	`}`
`2700`	`2702`
`2701`		`-`
`2702`	`2703`	`QgsDebugMsg( "Detected SRID is " + mDetectedSrid );`
`2703`	`2704`	`QgsDebugMsg( "Requested SRID is " + mRequestedSrid );`
`2704`	`2705`	`QgsDebugMsg( "Detected type is " + QString::number( mDetectedGeomType ) );`