Alternative fix to that in r5637 - fields that the user didn't touch

g_j_m · g_j_m · commit a34318825314 · 2006-07-26T09:24:18.000Z
are left to the database to fill in. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5639 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -1602,6 +1602,7 @@ bool QgsPostgresProvider::addFeature(QgsFeature* f, int primaryKeyHighWater)
       if (
            (fieldname != geometryColumn) &&
            (fieldname != primaryKey) &&
+           (!(it->fieldValue().isEmpty())) && 
            (fieldInLayer)
          )
       {
@@ -1691,12 +1692,11 @@ bool QgsPostgresProvider::addFeature(QgsFeature* f, int primaryKeyHighWater)
       if (
            (fieldname != geometryColumn) &&
            (fieldname != primaryKey) &&
+           (!(it->fieldValue().isEmpty())) && 
            (fieldInLayer)
          )
       {
         QString fieldvalue = it->fieldValue();
-        if (fieldvalue.isEmpty())
-          fieldvalue = "NULL";
         bool charactertype=false;
         insert+=",";
 

Original file line number	Diff line number	Diff line change
`@@ -1602,6 +1602,7 @@ bool QgsPostgresProvider::addFeature(QgsFeature* f, int primaryKeyHighWater)`
`1602`	`1602`	`if (`
`1603`	`1603`	`(fieldname != geometryColumn) &&`
`1604`	`1604`	`(fieldname != primaryKey) &&`
	`1605`	`+ (!(it->fieldValue().isEmpty())) &&`
`1605`	`1606`	`(fieldInLayer)`
`1606`	`1607`	`)`
`1607`	`1608`	`{`
`@@ -1691,12 +1692,11 @@ bool QgsPostgresProvider::addFeature(QgsFeature* f, int primaryKeyHighWater)`
`1691`	`1692`	`if (`
`1692`	`1693`	`(fieldname != geometryColumn) &&`
`1693`	`1694`	`(fieldname != primaryKey) &&`
	`1695`	`+ (!(it->fieldValue().isEmpty())) &&`
`1694`	`1696`	`(fieldInLayer)`
`1695`	`1697`	`)`
`1696`	`1698`	`{`
`1697`	`1699`	`QString fieldvalue = it->fieldValue();`
`1698`		`- if (fieldvalue.isEmpty())`
`1699`		`- fieldvalue = "NULL";`
`1700`	`1700`	`bool charactertype=false;`
`1701`	`1701`	`insert+=",";`
`1702`	`1702`