Fix ogr and spatialite default values

qgis · Jan 27, 2020 · f259345 · f259345
1 parent 13681cc
commit f259345
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 35 deletions.
diff --git a/src/core/providers/ogr/qgsogrprovider.cpp b/src/core/providers/ogr/qgsogrprovider.cpp
@@ -1209,13 +1209,18 @@ void QgsOgrProvider::loadFields()
     QString defaultValue = textEncoding()->toUnicode( OGR_Fld_GetDefault( fldDef ) );
     if ( !defaultValue.isEmpty() && !OGR_Fld_IsDefaultDriverSpecific( fldDef ) )
     {
+      if ( defaultValue.startsWith( '\'' ) )
+      {
+        defaultValue = defaultValue.remove( 0, 1 );
+        defaultValue.chop( 1 );
+        defaultValue.replace( QLatin1String( "''" ), QLatin1String( "'" ) );
+      }
       mDefaultValues.insert( createdFields, defaultValue );
     }
 
     mAttributeFields.append( newField );
     createdFields++;
   }
-
 }
 
 
@@ -1389,13 +1394,6 @@ QVariant QgsOgrProvider::defaultValue( int fieldId ) const
     resultVar = QDate::currentDate();
   else if ( defaultVal == QStringLiteral( "CURRENT_TIME" ) )
     resultVar = QTime::currentTime();
-  else if ( defaultVal.startsWith( '\'' ) )
-  {
-    defaultVal = defaultVal.remove( 0, 1 );
-    defaultVal.chop( 1 );
-    defaultVal.replace( QLatin1String( "''" ), QLatin1String( "'" ) );
-    resultVar = defaultVal;
-  }
 
   ( void )mAttributeFields.at( fieldId ).convertCompatible( resultVar );
   return resultVar;

diff --git a/src/providers/spatialite/qgsspatialiteprovider.cpp b/src/providers/spatialite/qgsspatialiteprovider.cpp
@@ -956,19 +956,22 @@ void QgsSpatiaLiteProvider::insertDefaultValue( int fieldIndex, QString defaultV
 
     if ( mAttributeFields.at( fieldIndex ).name() != mPrimaryKey || ( mAttributeFields.at( fieldIndex ).name() == mPrimaryKey && !mPrimaryKeyAutoIncrement ) )
     {
+      bool ok;
       switch ( mAttributeFields.at( fieldIndex ).type() )
       {
         case QVariant::LongLong:
-          defaultVariant = defaultVal.toLongLong();
+          defaultVariant = defaultVal.toLongLong( &ok );
           break;
 
         case QVariant::Double:
-          defaultVariant = defaultVal.toDouble();
+          defaultVariant = defaultVal.toDouble( &ok );
           break;
 
         default:
         {
-          if ( defaultVal.startsWith( '\'' ) )
+          // Literal string?
+          ok = defaultVal.startsWith( '\'' );
+          if ( ok )
             defaultVal = defaultVal.remove( 0, 1 );
           if ( defaultVal.endsWith( '\'' ) )
             defaultVal.chop( 1 );
@@ -978,14 +981,20 @@ void QgsSpatiaLiteProvider::insertDefaultValue( int fieldIndex, QString defaultV
           break;
         }
       }
+
+      if ( ! ok )  // Must be a SQL clause
+      {
+        mDefaultValueClause.insert( fieldIndex, defaultVal );
+      }
+
     }
-    mDefaultValues.insert( fieldIndex, defaultVariant );
+    mDefaultValues.insert( fieldIndex, defaultVal );
   }
 }
 
 QString QgsSpatiaLiteProvider::defaultValueClause( int fieldIndex ) const
 {
-  return mDefaultValues.value( fieldIndex, QString() ).toString();
+  return mDefaultValueClause.value( fieldIndex, QString() );
 }
 
 void QgsSpatiaLiteProvider::handleError( const QString &sql, char *errorMessage, bool rollback )
@@ -3962,7 +3971,7 @@ bool QgsSpatiaLiteProvider::addFeatures( QgsFeatureList &flist, Flags flags )
   sqlite3_stmt *stmt = nullptr;
   char *errMsg = nullptr;
   bool toCommit = false;
-  QString values;
+  QString baseValues;
   QString separator;
   int ia, ret;
   // SQL for single row
@@ -3978,19 +3987,20 @@ bool QgsSpatiaLiteProvider::addFeatures( QgsFeatureList &flist, Flags flags )
     toCommit = true;
 
     QString baseSql { QStringLiteral( "INSERT INTO %1(" ).arg( QgsSqliteUtils::quotedIdentifier( mTableName ) ) };
-    values = QStringLiteral( ") VALUES (" );
+    baseValues = QStringLiteral( ") VALUES (" );
     separator.clear();
 
     if ( !mGeometryColumn.isEmpty() )
     {
       baseSql += separator + QgsSqliteUtils::quotedIdentifier( mGeometryColumn );
-      values += separator + geomParam();
+      baseValues += separator + geomParam();
       separator = ',';
     }
 
     for ( QgsFeatureList::iterator feature = flist.begin(); feature != flist.end(); ++feature )
     {
 
+      QString values { baseValues };
       sql = baseSql;
 
       // looping on each feature to insert
@@ -4001,7 +4011,7 @@ bool QgsSpatiaLiteProvider::addFeatures( QgsFeatureList &flist, Flags flags )
 
       for ( int i = 0; i < attributevec.count(); ++i )
       {
-        if ( mDefaultValues.contains( i ) && defaultValue( i ) == attributevec.at( i ).toString() )
+        if ( mDefaultValues.contains( i ) && mDefaultValues.value( i ) == attributevec.at( i ).toString() )
         {
           defaultIndexes.push_back( i );
           continue;
@@ -4125,7 +4135,7 @@ bool QgsSpatiaLiteProvider::addFeatures( QgsFeatureList &flist, Flags flags )
         // performing actual row insert
         ret = sqlite3_step( stmt );
 
-        qDebug() << sqlite3_expanded_sql( stmt );
+        sqlite3_finalize( stmt );
 
         if ( ret == SQLITE_DONE || ret == SQLITE_ROW )
         {
@@ -4145,14 +4155,13 @@ bool QgsSpatiaLiteProvider::addFeatures( QgsFeatureList &flist, Flags flags )
           break;
         }
       }
+    } // prepared statement
 
-      sqlite3_finalize( stmt );
+    if ( ret == SQLITE_DONE || ret == SQLITE_ROW )
+    {
+      ret = sqlite3_exec( mSqliteHandle, "COMMIT", nullptr, nullptr, &errMsg );
+    }
 
-      if ( ret == SQLITE_DONE || ret == SQLITE_ROW )
-      {
-        ret = sqlite3_exec( mSqliteHandle, "COMMIT", nullptr, nullptr, &errMsg );
-      }
-    } // prepared statement
   } // BEGIN statement
 
   if ( ret != SQLITE_OK )
@@ -4552,7 +4561,30 @@ QgsVectorDataProvider::Capabilities QgsSpatiaLiteProvider::capabilities() const
 
 QVariant QgsSpatiaLiteProvider::defaultValue( int fieldId ) const
 {
-  return mDefaultValues.value( fieldId, QVariant() );
+  if ( fieldId < 0 || fieldId >= mAttributeFields.count() )
+    return QVariant();
+
+  QString defaultVal = mDefaultValues.value( fieldId, QString() );
+  if ( defaultVal.isEmpty() )
+    return QVariant();
+
+  QVariant resultVar = defaultVal;
+  if ( defaultVal == QStringLiteral( "CURRENT_TIMESTAMP" ) )
+    resultVar = QDateTime::currentDateTime();
+  else if ( defaultVal == QStringLiteral( "CURRENT_DATE" ) )
+    resultVar = QDate::currentDate();
+  else if ( defaultVal == QStringLiteral( "CURRENT_TIME" ) )
+    resultVar = QTime::currentTime();
+  else if ( defaultVal.startsWith( '\'' ) )
+  {
+    defaultVal = defaultVal.remove( 0, 1 );
+    defaultVal.chop( 1 );
+    defaultVal.replace( QLatin1String( "''" ), QLatin1String( "'" ) );
+    resultVar = defaultVal;
+  }
+
+  ( void )mAttributeFields.at( fieldId ).convertCompatible( resultVar );
+  return resultVar;
 }
 
 bool QgsSpatiaLiteProvider::skipConstraintCheck( int fieldIndex, QgsFieldConstraints::Constraint constraint, const QVariant &value ) const

diff --git a/src/providers/spatialite/qgsspatialiteprovider.h b/src/providers/spatialite/qgsspatialiteprovider.h
@@ -221,6 +221,9 @@ class QgsSpatiaLiteProvider: public QgsVectorDataProvider
 
     QgsFields mAttributeFields;
 
+    //! Map of field index to default value SQL fragments
+    QMap<int, QString> mDefaultValueClause;
+
     //! Flag indicating if the layer data source is a valid SpatiaLite layer
     bool mValid = false;
 
@@ -264,7 +267,7 @@ class QgsSpatiaLiteProvider: public QgsVectorDataProvider
     QString mGeometryColumn;
 
     //! Map of field index to default value
-    QMap<int, QVariant> mDefaultValues;
+    QMap<int, QString> mDefaultValues;
 
     //! Name of the SpatialIndex table
     QString mIndexTable;

diff --git a/tests/src/python/test_provider_ogr.py b/tests/src/python/test_provider_ogr.py
@@ -630,10 +630,11 @@ def testSpatialiteDefaultValues(self):
         sql = """
         CREATE TABLE test_table (
             id integer primary key autoincrement,
-            comment text,
+            comment TEXT,
             created_at_01 text DEFAULT (datetime('now','localtime')),
             created_at_02 text DEFAULT CURRENT_TIMESTAMP,
-            anumber INTEGER DEFAULT 123
+            anumber INTEGER DEFAULT 123,
+            atext TEXT default 'My default'
         )
         """
         cur.execute(sql)
@@ -644,8 +645,8 @@ def testSpatialiteDefaultValues(self):
         self.assertTrue(vl.isValid())
         feature = QgsFeature(vl.fields())
         for idx in range(vl.fields().count()):
-            default = vl.dataProvider().defaultValueClause(idx)
-            if default != '':
+            default = vl.dataProvider().defaultValue(idx)
+            if default is not None:
                 feature.setAttribute(idx, default)
             else:
                 feature.setAttribute(idx, 'A comment')
@@ -660,10 +661,11 @@ def testSpatialiteDefaultValues(self):
         vl2 = QgsVectorLayer(dbname + '|layername=test_table', 'test_table', 'ogr')
         self.assertTrue(vl2.isValid())
         feature = next(vl2.getFeatures())
+        self.assertEqual(feature.attribute(1), 'A comment')
         self.assertTrue(feature.attribute(2).startswith(now.strftime('%Y-%m-%d')))
         self.assertTrue(feature.attribute(3).startswith(now.strftime('%Y-%m-%d')))
         self.assertEqual(feature.attribute(4), 123)
-        self.assertEqual(feature.attribute(1), 'A comment')
+        self.assertEqual(feature.attribute(5), 'My default')
 
 
 if __name__ == '__main__':

diff --git a/tests/src/python/test_provider_spatialite.py b/tests/src/python/test_provider_spatialite.py
@@ -1166,7 +1166,7 @@ def testSpatialiteDefaultValues(self):
 
         # Create the test table
 
-        dbname = os.path.join(tempfile.gettempdir(), "test.sqlite")
+        dbname = os.path.join(tempfile.gettempdir(), "test_default_values.sqlite")
         if os.path.exists(dbname):
             os.remove(dbname)
         con = spatialite_connect(dbname, isolation_level=None)
@@ -1182,7 +1182,8 @@ def testSpatialiteDefaultValues(self):
             comment text,
             created_at_01 text DEFAULT (datetime('now','localtime')),
             created_at_02 text DEFAULT CURRENT_TIMESTAMP,
-            anumber INTEGER DEFAULT 123
+            anumber INTEGER DEFAULT 123,
+            atext TEXT default 'My default'
         )
         """
         cur.execute(sql)
@@ -1193,8 +1194,8 @@ def testSpatialiteDefaultValues(self):
         self.assertTrue(vl.isValid())
         feature = QgsFeature(vl.fields())
         for idx in range(vl.fields().count()):
-            default = vl.dataProvider().defaultValueClause(idx)
-            if default != '':
+            default = vl.dataProvider().defaultValue(idx)
+            if default is not None:
                 feature.setAttribute(idx, default)
             else:
                 feature.setAttribute(idx, 'A comment')
@@ -1209,9 +1210,11 @@ def testSpatialiteDefaultValues(self):
         vl2 = QgsVectorLayer("dbname='%s' table='test_table'" % dbname, 'test_table', 'spatialite')
         self.assertTrue(vl2.isValid())
         feature = next(vl2.getFeatures())
+        self.assertEqual(feature.attribute(1), 'A comment')
         self.assertTrue(feature.attribute(2).startswith(now.strftime('%Y-%m-%d')))
         self.assertTrue(feature.attribute(3).startswith(now.strftime('%Y-%m-%d')))
         self.assertEqual(feature.attribute(4), 123)
+        self.assertEqual(feature.attribute(5), 'My default')
 
 
 if __name__ == '__main__':