Be careful with requesting evaluated default values

m-kuhn · m-kuhn · commit 60bbf67b08b0 · 2017-05-13T08:42:14.000+02:00
We do not need a new evaluated value all the time Fix #16545
diff --git a/python/core/qgsvectordataprovider.sip b/python/core/qgsvectordataprovider.sip
@@ -234,9 +234,11 @@ class QgsVectorDataProvider : QgsDataProvider
                                  const QMap<qint64, QgsGeometry> &geometry_map );
 
     /**
-     * Returns the default value for field specified by @c fieldId
+     * Returns the default value for field specified by \a fieldId.
+     * If \a forceLazyEval is set to true, the provider the default value
+     * will not be evaluated on server side even if specified in the project properties.
      */
-    virtual QVariant defaultValue( int fieldId );
+    virtual QVariant defaultValue( int fieldId, bool forceLazyEval = false );
 
     /**
      * Changes geometries of existing features
diff --git a/src/app/qgsidentifyresultsdialog.cpp b/src/app/qgsidentifyresultsdialog.cpp
@@ -531,9 +531,10 @@ void QgsIdentifyResultsDialog::addFeature( QgsVectorLayer *vlayer, const QgsFeat
       continue;
     }
 
+    // _TAG
     QString defVal;
     if ( fields.fieldOrigin( i ) == QgsFields::OriginProvider && vlayer->dataProvider() )
-      defVal = vlayer->dataProvider()->defaultValue( fields.fieldOriginIndex( i ) ).toString();
+      defVal = vlayer->dataProvider()->defaultValue( fields.fieldOriginIndex( i ), true ).toString();
 
     QString value = defVal == attrs.at( i ) ? defVal : fields.at( i ).displayString( attrs.at( i ) );
     QTreeWidgetItem *attrItem = new QTreeWidgetItem( QStringList() << QString::number( i ) << value );
diff --git a/src/core/qgsvectordataprovider.cpp b/src/core/qgsvectordataprovider.cpp
@@ -93,8 +93,9 @@ bool QgsVectorDataProvider::changeAttributeValues( const QgsChangedAttributesMap
   return false;
 }
 
-QVariant QgsVectorDataProvider::defaultValue( int fieldId )
+QVariant QgsVectorDataProvider::defaultValue( int fieldId, bool forceLazyEval )
 {
+  Q_UNUSED( forceLazyEval )
   Q_UNUSED( fieldId );
   return QVariant();
 }
diff --git a/src/core/qgsvectordataprovider.h b/src/core/qgsvectordataprovider.h
@@ -285,9 +285,11 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
                                  const QgsGeometryMap &geometry_map );
 
     /**
-     * Returns the default value for field specified by @c fieldId
+     * Returns the default value for field specified by \a fieldId.
+     * If \a forceLazyEval is set to true, the provider the default value
+     * will not be evaluated on server side even if specified in the project properties.
      */
-    virtual QVariant defaultValue( int fieldId );
+    virtual QVariant defaultValue( int fieldId, bool forceLazyEval = false );
 
     /**
      * Changes geometries of existing features
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetfactory.cpp b/src/gui/editorwidgets/core/qgseditorwidgetfactory.cpp
@@ -70,7 +70,7 @@ QString QgsEditorWidgetFactory::representValue( QgsVectorLayer* vl, int fieldIdx
 
   QString defVal;
   if ( vl->fields().fieldOrigin( fieldIdx ) == QgsFields::OriginProvider && vl->dataProvider() )
-    defVal = vl->dataProvider()->defaultValue( vl->fields().fieldOriginIndex( fieldIdx ) ).toString();
+    defVal = vl->dataProvider()->defaultValue( vl->fields().fieldOriginIndex( fieldIdx ), true ).toString();
 
   return value == defVal ? defVal : vl->fields().at( fieldIdx ).displayString( value );
 }
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp b/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp
@@ -42,7 +42,11 @@ QgsField QgsEditorWidgetWrapper::field() const
 
 QVariant QgsEditorWidgetWrapper::defaultValue() const
 {
-  mDefaultValue = layer()->dataProvider()->defaultValue( mFieldIdx );
+  if ( !mDefaultValue.isValid() )
+  {
+    QgsVectorLayer* lyr = layer();
+    mDefaultValue = lyr->dataProvider()->defaultValue( lyr->fields().fieldOriginIndex( mFieldIdx ) );
+  }
 
   return mDefaultValue;
 }
diff --git a/src/providers/gpx/qgsgpxprovider.cpp b/src/providers/gpx/qgsgpxprovider.cpp
@@ -515,8 +515,9 @@ void QgsGPXProvider::changeAttributeValues( QgsGPSObject& obj, const QgsAttribut
 }
 
 
-QVariant QgsGPXProvider::defaultValue( int fieldId )
+QVariant QgsGPXProvider::defaultValue( int fieldId, bool forceLazyEval )
 {
+  Q_UNUSED( forceLazyEval )
   if ( fieldId == SrcAttr )
     return tr( "Digitized in QGIS" );
   return QVariant();
diff --git a/src/providers/gpx/qgsgpxprovider.h b/src/providers/gpx/qgsgpxprovider.h
@@ -97,9 +97,11 @@ class QgsGPXProvider : public QgsVectorDataProvider
     virtual int capabilities() const override;
 
     /**
-     * Returns the default value for field specified by @c fieldId
+     * Returns the default value for field specified by \a fieldId.
+     * If \a forceLazyEval is set to true, the provider the default value
+     * will not be evaluated on server side even if specified in the project properties.
      */
-    virtual QVariant defaultValue( int fieldId ) override;
+    virtual QVariant defaultValue( int fieldId, bool forceLazyEval = false ) override;
 
 
     /* Functions inherited from QgsDataProvider */
diff --git a/src/providers/mssql/qgsmssqlprovider.cpp b/src/providers/mssql/qgsmssqlprovider.cpp
@@ -502,8 +502,10 @@ QString QgsMssqlProvider::quotedValue( const QVariant& value )
   }
 }
 
-QVariant QgsMssqlProvider::defaultValue( int fieldId )
+QVariant QgsMssqlProvider::defaultValue( int fieldId, bool forceLazyEval )
 {
+  Q_UNUSED( forceLazyEval )
+
   if ( mDefaultValues.contains( fieldId ) )
     return mDefaultValues[fieldId];
   else
diff --git a/src/providers/mssql/qgsmssqlprovider.h b/src/providers/mssql/qgsmssqlprovider.h
@@ -231,8 +231,12 @@ class QgsMssqlProvider : public QgsVectorDataProvider
     /** Convert values to quoted values for database work **/
     static QString quotedValue( const QVariant& value );
 
-    /** Returns the default value for field specified by @c fieldId */
-    QVariant defaultValue( int fieldId ) override;
+    /**
+     * Returns the default value for field specified by \a fieldId.
+     * If \a forceLazyEval is set to true, the provider the default value
+     * will not be evaluated on server side even if specified in the project properties.
+     */
+    virtual QVariant defaultValue( int fieldId, bool forceLazyEval = false ) override;
 
     /** Import a vector layer into the database */
     static QgsVectorLayerImport::ImportError createEmptyLayer(
diff --git a/src/providers/oracle/qgsoracleprovider.cpp b/src/providers/oracle/qgsoracleprovider.cpp
@@ -1188,8 +1188,9 @@ bool QgsOracleProvider::isValid()
   return mValid;
 }
 
-QVariant QgsOracleProvider::defaultValue( int fieldId )
+QVariant QgsOracleProvider::defaultValue( int fieldId, bool forceLazyEval )
 {
+  Q_UNUSED( forceLazyEval )
   return mDefaultValues.value( fieldId, QVariant() );
 }
 
diff --git a/src/providers/oracle/qgsoracleprovider.h b/src/providers/oracle/qgsoracleprovider.h
@@ -182,8 +182,12 @@ class QgsOracleProvider : public QgsVectorDataProvider
     /** Returns the default value for field specified by @c fieldName */
     QVariant defaultValue( QString fieldName, QString tableName = QString::null, QString schemaName = QString::null );
 
-    /** Returns the default value for field specified by @c fieldId */
-    QVariant defaultValue( int fieldId ) override;
+    /**
+     * Returns the default value for field specified by \a fieldId.
+     * If \a forceLazyEval is set to true, the provider the default value
+     * will not be evaluated on server side even if specified in the project properties.
+     */
+    virtual QVariant defaultValue( int fieldId, bool forceLazyEval = false ) override;
 
     /** Adds a list of features
       @return true in case of success and false in case of failure*/
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -1714,11 +1714,11 @@ bool QgsPostgresProvider::isValid()
   return mValid;
 }
 
-QVariant QgsPostgresProvider::defaultValue( int fieldId )
+QVariant QgsPostgresProvider::defaultValue( int fieldId, bool forceLazyEval )
 {
-  QVariant defVal = mDefaultValues.value( fieldId, QString::null );
+  QVariant defVal = mDefaultValues.value( fieldId, QString() );
 
-  if ( providerProperty( EvaluateDefaultValues, false ).toBool() && !defVal.isNull() )
+  if ( providerProperty( EvaluateDefaultValues, false ).toBool() && !defVal.isNull() && !forceLazyEval )
   {
     const QgsField& fld = field( fieldId );
 
diff --git a/src/providers/postgres/qgspostgresprovider.h b/src/providers/postgres/qgspostgresprovider.h
@@ -194,8 +194,12 @@ class QgsPostgresProvider : public QgsVectorDataProvider
 
     QgsAttributeList pkAttributeIndexes() override { return mPrimaryKeyAttrs; }
 
-    /** Returns the default value for field specified by @c fieldId */
-    QVariant defaultValue( int fieldId ) override;
+    /**
+     * Returns the default value for field specified by \a fieldId.
+     * If \a forceLazyEval is set to true, the provider the default value
+     * will not be evaluated on server side even if specified in the project properties.
+     */
+    virtual QVariant defaultValue( int fieldId , bool forceLazyEval = false ) override;
 
     /** Adds a list of features
       @return true in case of success and false in case of failure*/

Original file line number	Diff line number	Diff line change
`@@ -93,8 +93,9 @@ bool QgsVectorDataProvider::changeAttributeValues( const QgsChangedAttributesMap`
`93`	`93`	`return false;`
`94`	`94`	`}`
`95`	`95`
`96`		`-QVariant QgsVectorDataProvider::defaultValue( int fieldId )`
	`96`	`+QVariant QgsVectorDataProvider::defaultValue( int fieldId, bool forceLazyEval )`
`97`	`97`	`{`
	`98`	`+ Q_UNUSED( forceLazyEval )`
`98`	`99`	`Q_UNUSED( fieldId );`
`99`	`100`	`return QVariant();`
`100`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ QString QgsEditorWidgetFactory::representValue( QgsVectorLayer* vl, int fieldIdx`
`70`	`70`
`71`	`71`	`QString defVal;`
`72`	`72`	`if ( vl->fields().fieldOrigin( fieldIdx ) == QgsFields::OriginProvider && vl->dataProvider() )`
`73`		`- defVal = vl->dataProvider()->defaultValue( vl->fields().fieldOriginIndex( fieldIdx ) ).toString();`
	`73`	`+ defVal = vl->dataProvider()->defaultValue( vl->fields().fieldOriginIndex( fieldIdx ), true ).toString();`
`74`	`74`
`75`	`75`	`return value == defVal ? defVal : vl->fields().at( fieldIdx ).displayString( value );`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,11 @@ QgsField QgsEditorWidgetWrapper::field() const`
`42`	`42`
`43`	`43`	`QVariant QgsEditorWidgetWrapper::defaultValue() const`
`44`	`44`	`{`
`45`		`- mDefaultValue = layer()->dataProvider()->defaultValue( mFieldIdx );`
	`45`	`+ if ( !mDefaultValue.isValid() )`
	`46`	`+ {`
	`47`	`+ QgsVectorLayer* lyr = layer();`
	`48`	`+ mDefaultValue = lyr->dataProvider()->defaultValue( lyr->fields().fieldOriginIndex( mFieldIdx ) );`
	`49`	`+ }`
`46`	`50`
`47`	`51`	`return mDefaultValue;`
`48`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -515,8 +515,9 @@ void QgsGPXProvider::changeAttributeValues( QgsGPSObject& obj, const QgsAttribut`
`515`	`515`	`}`
`516`	`516`
`517`	`517`
`518`		`-QVariant QgsGPXProvider::defaultValue( int fieldId )`
	`518`	`+QVariant QgsGPXProvider::defaultValue( int fieldId, bool forceLazyEval )`
`519`	`519`	`{`
	`520`	`+ Q_UNUSED( forceLazyEval )`
`520`	`521`	`if ( fieldId == SrcAttr )`
`521`	`522`	`return tr( "Digitized in QGIS" );`
`522`	`523`	`return QVariant();`
Original file line number	Diff line number	Diff line change
`@@ -502,8 +502,10 @@ QString QgsMssqlProvider::quotedValue( const QVariant& value )`
`502`	`502`	`}`
`503`	`503`	`}`
`504`	`504`
`505`		`-QVariant QgsMssqlProvider::defaultValue( int fieldId )`
	`505`	`+QVariant QgsMssqlProvider::defaultValue( int fieldId, bool forceLazyEval )`
`506`	`506`	`{`
	`507`	`+ Q_UNUSED( forceLazyEval )`
	`508`	`+`
`507`	`509`	`if ( mDefaultValues.contains( fieldId ) )`
`508`	`510`	`return mDefaultValues[fieldId];`
`509`	`511`	`else`