take DEFAULT as the postgres providers default value (instead of NULL)

mhugent · mhugent · commit 4aead68e0ac0 · 2006-06-07T05:55:42.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5509 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -1592,7 +1592,7 @@ bool QgsPostgresProvider::addFeature(QgsFeature* f, int primaryKeyHighWater)
 #endif
         
         //add quotes if the field is a character or date type
-        if(fieldvalue!="NULL")
+      if(fieldvalue != "NULL" && fieldvalue != "DEFAULT")
         {
           for(std::vector<QgsField>::iterator iter=attributeFields.begin();iter!=attributeFields.end();++iter)
           {
@@ -1660,7 +1660,7 @@ bool QgsPostgresProvider::addFeature(QgsFeature* f, int primaryKeyHighWater)
 
 QString QgsPostgresProvider::getDefaultValue(const QString& attr, QgsFeature* f)
 {
-  return "NULL";
+  return "DEFAULT";
 }
 
 bool QgsPostgresProvider::deleteFeature(int id)

Original file line number	Diff line number	Diff line change
`@@ -1592,7 +1592,7 @@ bool QgsPostgresProvider::addFeature(QgsFeature* f, int primaryKeyHighWater)`
`1592`	`1592`	`#endif`
`1593`	`1593`
`1594`	`1594`	`//add quotes if the field is a character or date type`
`1595`		`- if(fieldvalue!="NULL")`
	`1595`	`+ if(fieldvalue != "NULL" && fieldvalue != "DEFAULT")`
`1596`	`1596`	`{`
`1597`	`1597`	`for(std::vector<QgsField>::iterator iter=attributeFields.begin();iter!=attributeFields.end();++iter)`
`1598`	`1598`	`{`
`@@ -1660,7 +1660,7 @@ bool QgsPostgresProvider::addFeature(QgsFeature* f, int primaryKeyHighWater)`
`1660`	`1660`
`1661`	`1661`	`QString QgsPostgresProvider::getDefaultValue(const QString& attr, QgsFeature* f)`
`1662`	`1662`	`{`
`1663`		`- return "NULL";`
	`1663`	`+ return "DEFAULT";`
`1664`	`1664`	`}`
`1665`	`1665`
`1666`	`1666`	`bool QgsPostgresProvider::deleteFeature(int id)`