fix for #130:

jef · jef · commit 31e1c2e349e0 · 2008-04-30T20:15:02.000Z
- skip type check for unchanged defaults in QgsAttributDialog - don't replace NULL default value with empty string git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8390 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsattributedialog.cpp b/src/app/qgsattributedialog.cpp
@@ -96,25 +96,30 @@ bool QgsAttributeDialog::queryAttributes(const QgsFieldMap& fields, QgsFeature&
   QgsAttributeDialog attdialog(fields, featureAttributes);
 
   if (attdialog.exec() == QDialog::Accepted)
-  { 
+  {
     int i=0;
-    for (QgsAttributeMap::const_iterator it = featureAttributes.begin(); it != featureAttributes.end(); ++it)
+    for (QgsAttributeMap::const_iterator it = featureAttributes.begin(); it != featureAttributes.end(); ++it, i++)
     {
-      QString value = attdialog.value(i++);
+      QString value = attdialog.value(i);
 
-      switch( fields[it.key()].type() )
+      if( attdialog.isDirty(i) )
       {
-      case QVariant::Int:
-        f.changeAttribute(it.key(), value=="" ? QVariant( QString::null ) : QVariant( value.toInt() ) );
-        break;
-
-      case QVariant::Double:
-        f.changeAttribute(it.key(), value=="" ? QVariant( QString::null ) : QVariant( value.toDouble() ) );
-        break;
-
-      default:
-        f.changeAttribute(it.key(), value=="NULL" ? QVariant(QString::null) : QVariant(value) );
-        break;
+        switch( fields[it.key()].type() )
+        {
+        case QVariant::Int:
+          f.changeAttribute(it.key(), value=="" ? QVariant( QString::null ) : QVariant( value.toInt() ) );
+          break;
+
+        case QVariant::Double:
+          f.changeAttribute(it.key(), value=="" ? QVariant( QString::null ) : QVariant( value.toDouble() ) );
+          break;
+
+        default:
+          f.changeAttribute(it.key(), value=="NULL" ? QVariant(QString::null) : QVariant(value) );
+          break;
+        }
+      } else {
+        f.changeAttribute(it.key(), QVariant(value) );
       }
     }
     return true;
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -1794,17 +1794,21 @@ bool QgsPostgresProvider::addFeatures(QgsFeatureList & flist)
       }
 
       insert += "," + quotedIdentifier(fieldname);
-      
+
       QString defVal = getDefaultValue( it.key() ).toString();
 
       if( i==flist.size() )
       {
-        if( !defVal.isNull() && *it==defVal)
+        if( *it==defVal )
         {
-          values += "," + defVal;
+          if( defVal.isNull() ) {
+            values += ",NULL";
+          } else {
+            values += "," + defVal;
+          }
         }
-        else
-        {
+        else 
+	{
           values += "," + quotedValue( it->toString() );
         }
       } 
@@ -1819,6 +1823,7 @@ bool QgsPostgresProvider::addFeatures(QgsFeatureList & flist)
 
     insert += values + ")";
 
+    QgsDebugMsg( QString("prepare addfeatures: %1").arg(insert) );
     PGresult *stmt = PQprepare(connection, "addfeatures", insert.toUtf8(), fieldId.size()+2, NULL);
     if(stmt==0 || PQresultStatus(stmt)==PGRES_FATAL_ERROR)
       throw PGException(stmt);

Original file line number	Diff line number	Diff line change
`@@ -1794,17 +1794,21 @@ bool QgsPostgresProvider::addFeatures(QgsFeatureList & flist)`
`1794`	`1794`	`}`
`1795`	`1795`
`1796`	`1796`	`insert += "," + quotedIdentifier(fieldname);`
`1797`		`-`
	`1797`	`+`
`1798`	`1798`	`QString defVal = getDefaultValue( it.key() ).toString();`
`1799`	`1799`
`1800`	`1800`	`if( i==flist.size() )`
`1801`	`1801`	`{`
`1802`		`- if( !defVal.isNull() && *it==defVal)`
	`1802`	`+ if( *it==defVal )`
`1803`	`1803`	`{`
`1804`		`- values += "," + defVal;`
	`1804`	`+ if( defVal.isNull() ) {`
	`1805`	`+ values += ",NULL";`
	`1806`	`+ } else {`
	`1807`	`+ values += "," + defVal;`
	`1808`	`+ }`
`1805`	`1809`	`}`
`1806`		`- else`
`1807`		`- {`
	`1810`	`+ else`
	`1811`	`+ {`
`1808`	`1812`	`values += "," + quotedValue( it->toString() );`
`1809`	`1813`	`}`
`1810`	`1814`	`}`
`@@ -1819,6 +1823,7 @@ bool QgsPostgresProvider::addFeatures(QgsFeatureList & flist)`
`1819`	`1823`
`1820`	`1824`	`insert += values + ")";`
`1821`	`1825`
	`1826`	`+ QgsDebugMsg( QString("prepare addfeatures: %1").arg(insert) );`
`1822`	`1827`	`PGresult *stmt = PQprepare(connection, "addfeatures", insert.toUtf8(), fieldId.size()+2, NULL);`
`1823`	`1828`	`if(stmt==0 \|\| PQresultStatus(stmt)==PGRES_FATAL_ERROR)`
`1824`	`1829`	`throw PGException(stmt);`