Fix for editing problems

mhugent · mhugent · commit fe77a6ac1224 · 2007-04-12T07:55:29.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@6882 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsmaptoolcapture.cpp b/src/app/qgsmaptoolcapture.cpp
@@ -148,8 +148,8 @@ void QgsMapToolCapture::canvasReleaseEvent(QMouseEvent * e)
 
       f->setGeometryAndOwnership(&wkb[0],size);
       // add the fields to the QgsFeature
-      const QgsFieldMap& fields=provider->fields();
-      for(QgsFieldMap::const_iterator it = fields.begin(); it != fields.end(); ++it)
+      const QgsFieldMap fields=provider->fields();
+      for(QgsFieldMap::const_iterator it = fields.constBegin(); it != fields.constEnd(); ++it)
       {
         f->addAttribute(it.key(), provider->getDefaultValue(it.key()) );
       }
@@ -371,7 +371,7 @@ void QgsMapToolCapture::canvasReleaseEvent(QMouseEvent * e)
       f->setGeometryAndOwnership(&wkb[0],size);
   
       // add the fields to the QgsFeature
-      const QgsFieldMap& fields = provider->fields();
+      const QgsFieldMap fields = provider->fields();
       for(QgsFieldMap::const_iterator it = fields.begin(); it != fields.end(); ++it)
       {
         f->addAttribute(it.key(), provider->getDefaultValue(it.key()));
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -1549,24 +1549,33 @@ bool QgsPostgresProvider::addFeature(QgsFeature& f, int primaryKeyHighWater)
               )
           {
             charactertype=true;
-            break; // no need to continue with this loop
           }
         
         }
 
         // important: escape quotes in field value
         fieldvalue.replace("'", "''");
 
-        // XXX isn't it better to always escape field value?
-        if(charactertype)
-        {
-          insert+="'";
-        }
-        insert+=fieldvalue;
-        if(charactertype)
-        {
-          insert+="'";
-        }
+	//request default value explicitly if fieldvalue is an empty string
+	if(fieldvalue.isEmpty())
+	  {
+	    insert += "DEFAULT";
+	  }
+	else
+	  {
+	    // XXX isn't it better to always escape field value?
+	    if(charactertype)
+	      {
+		insert+="'";
+	      }
+	    
+	    insert+=fieldvalue;
+	    
+	    if(charactertype)
+	      {
+		insert+="'";
+	      }
+	  }
       }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -148,8 +148,8 @@ void QgsMapToolCapture::canvasReleaseEvent(QMouseEvent * e)`
`148`	`148`
`149`	`149`	`f->setGeometryAndOwnership(&wkb[0],size);`
`150`	`150`	`// add the fields to the QgsFeature`
`151`		`- const QgsFieldMap& fields=provider->fields();`
`152`		`- for(QgsFieldMap::const_iterator it = fields.begin(); it != fields.end(); ++it)`
	`151`	`+ const QgsFieldMap fields=provider->fields();`
	`152`	`+ for(QgsFieldMap::const_iterator it = fields.constBegin(); it != fields.constEnd(); ++it)`
`153`	`153`	`{`
`154`	`154`	`f->addAttribute(it.key(), provider->getDefaultValue(it.key()) );`
`155`	`155`	`}`
`@@ -371,7 +371,7 @@ void QgsMapToolCapture::canvasReleaseEvent(QMouseEvent * e)`
`371`	`371`	`f->setGeometryAndOwnership(&wkb[0],size);`
`372`	`372`
`373`	`373`	`// add the fields to the QgsFeature`
`374`		`- const QgsFieldMap& fields = provider->fields();`
	`374`	`+ const QgsFieldMap fields = provider->fields();`
`375`	`375`	`for(QgsFieldMap::const_iterator it = fields.begin(); it != fields.end(); ++it)`
`376`	`376`	`{`
`377`	`377`	`f->addAttribute(it.key(), provider->getDefaultValue(it.key()));`