add null and is null macros for QgsFeatureId (#8085)

3nids · web-flow · commit d2fdfe8f6fb5 · 2018-10-02T04:15:25.000-08:00
* add null and is null macros for QgsFeatureId
* Finalize FID_NULL
* No string to fid null conversion for now
* add parenthesis to fix macro call
diff --git a/src/core/qgsfeatureid.h b/src/core/qgsfeatureid.h
@@ -23,10 +23,12 @@ email                : matthias@opengis.ch
 
 // 64 bit feature ids
 typedef qint64 QgsFeatureId SIP_SKIP;
-#define FID_IS_NEW(fid)     (fid<0)
-#define FID_TO_NUMBER(fid)  static_cast<qint64>(fid)
-#define FID_TO_STRING(fid)  QString::number( fid )
-#define STRING_TO_FID(str)  (str).toLongLong()
+#define FID_NULL            std::numeric_limits<QgsFeatureId>::min()
+#define FID_IS_NULL(fid)    ( fid == std::numeric_limits<QgsFeatureId>::min() )
+#define FID_IS_NEW(fid)     ( fid < 0 && fid != std::numeric_limits<QgsFeatureId>::min() )
+#define FID_TO_NUMBER(fid)  static_cast<qint64>( fid )
+#define FID_TO_STRING(fid)  ( fid != std::numeric_limits<QgsFeatureId>::min() ? QString::number( fid ) : QStringLiteral( "NULL" ) )
+#define STRING_TO_FID(str)  ( (str).toLongLong() )
 
 #ifndef SIP_RUN
 typedef QSet<QgsFeatureId> QgsFeatureIds;
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -590,7 +590,7 @@ QString QgsPostgresUtils::whereClause( const QgsFeatureIds &featureIds, const Qg
 
         Q_FOREACH ( const QgsFeatureId featureId, featureIds )
         {
-          expr += delim + FID_TO_STRING( pkType == PktOid ? featureId : pkType == PktUint64 ? featureId : FID2PKINT( featureId ) );
+          expr += delim + FID_TO_STRING( ( pkType == PktOid ? featureId : pkType == PktUint64 ? featureId : FID2PKINT( featureId ) ) );
           delim = ',';
         }
         expr += ')';

Original file line number	Diff line number	Diff line change
`@@ -590,7 +590,7 @@ QString QgsPostgresUtils::whereClause( const QgsFeatureIds &featureIds, const Qg`
`590`	`590`
`591`	`591`	`Q_FOREACH ( const QgsFeatureId featureId, featureIds )`
`592`	`592`	`{`
`593`		`- expr += delim + FID_TO_STRING( pkType == PktOid ? featureId : pkType == PktUint64 ? featureId : FID2PKINT( featureId ) );`
	`593`	`+ expr += delim + FID_TO_STRING( ( pkType == PktOid ? featureId : pkType == PktUint64 ? featureId : FID2PKINT( featureId ) ) );`
`594`	`594`	`delim = ',';`
`595`	`595`	`}`
`596`	`596`	`expr += ')';`