expressions: only quote when necessary (fixes tests; followup 915f5c1)

qgis · Feb 9, 2014 · f3b2649 · f3b2649
1 parent 83d2b61
commit f3b2649
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -2266,7 +2266,7 @@ bool QgsExpression::NodeColumnRef::prepare( QgsExpression* parent, const QgsFiel
 
 QString QgsExpression::NodeColumnRef::dump() const
 {
-  return quotedColumnRef( mName );
+  return QRegExp( "^[A-Za-z_\x80-\xff][A-Za-z0-9_\x80-\xff]*$" ).exactMatch( mName ) ? mName : quotedColumnRef( mName );
 }
 
 //

diff --git a/src/core/qgsvectorlayereditbuffer.cpp b/src/core/qgsvectorlayereditbuffer.cpp
@@ -40,7 +40,7 @@ bool QgsVectorLayerEditBuffer::isModified() const
 
 void QgsVectorLayerEditBuffer::undoIndexChanged( int index )
 {
-  qDebug( "undo index changed %d", index );
+  QgsDebugMsg( QString( "undo index changed %1" ).arg( index ) );
   Q_UNUSED( index );
   emit layerModified();
 }

diff --git a/tests/src/python/test_qgsexpression.py b/tests/src/python/test_qgsexpression.py
@@ -83,5 +83,9 @@ def testCantOverrideBuiltinsWithUnregister(self):
 		success = QgsExpression.unregisterFunction("sqrt")
 		self.assertFalse(success)
 
+	def testDump(self):
+		for txt in ["id", u"idä", "\"id abc\"", "\"id	abc\""]:
+			self.assertEqual( txt, QgsExpression(txt).expression() )
+
 if __name__ == "__main__":
 	unittest.main()