QVariantMaps always have string keys

m-kuhn · m-kuhn · commit f9da59646248 · 2018-08-24T08:47:23.000+02:00
diff --git a/src/core/expression/qgsexpression.cpp b/src/core/expression/qgsexpression.cpp
@@ -912,7 +912,7 @@ QString QgsExpression::formatPreviewString( const QVariant &value )
       if ( separator.isEmpty() )
         separator = QStringLiteral( "," );
 
-      mapStr.append( QStringLiteral( " %1: %2" ).arg( quotedValue( it.key() ), formatPreviewString( it.value() ) ) );
+      mapStr.append( QStringLiteral( " '%1': %2" ).arg( it.key(), formatPreviewString( it.value() ) ) );
       if ( mapStr.length() > MAX_PREVIEW - 3 )
       {
         mapStr = tr( "%1…" ).arg( mapStr.left( MAX_PREVIEW - 2 ) );
diff --git a/tests/src/core/testqgsexpression.cpp b/tests/src/core/testqgsexpression.cpp
@@ -3112,11 +3112,11 @@ class TestQgsExpression: public QObject
       QCOMPARE( QgsExpression::formatPreviewString( QVariant( QVariantMap() ) ), QStringLiteral( "{}" ) );
 
       QVariantMap map;
-      map[1] = "One";
-      map[2] = "Two";
-      QCOMPARE( QgsExpression::formatPreviewString( QVariant( map ) ), QStringLiteral( "{ 1: 'One', 2: 'Two' }" ) );
+      map[QStringLiteral( "1" )] = "One";
+      map[QStringLiteral( "2" )] = "Two";
+      QCOMPARE( QgsExpression::formatPreviewString( QVariant( map ) ), QStringLiteral( "{ '1': 'One', 2: 'Two' }" ) );
       map[QStringLiteral( "3" )] = "A very long string that is going to be truncated";
-      QCOMPARE( QgsExpression::formatPreviewString( QVariant( map ) ), QStringLiteral( "{ 1: 'One', 2: 'Two', '3': 'A very long string that is going to … }" ) );
+      QCOMPARE( QgsExpression::formatPreviewString( QVariant( map ) ), QStringLiteral( "{ '1': 'One', '2': 'Two', '3': 'A very long string that is going to … }" ) );
 
       QVariantList list;
       list << 1 << 2 << 3;

Original file line number	Diff line number	Diff line change
`@@ -912,7 +912,7 @@ QString QgsExpression::formatPreviewString( const QVariant &value )`
`912`	`912`	`if ( separator.isEmpty() )`
`913`	`913`	`separator = QStringLiteral( "," );`
`914`	`914`
`915`		`- mapStr.append( QStringLiteral( " %1: %2" ).arg( quotedValue( it.key() ), formatPreviewString( it.value() ) ) );`
	`915`	`+ mapStr.append( QStringLiteral( " '%1': %2" ).arg( it.key(), formatPreviewString( it.value() ) ) );`
`916`	`916`	`if ( mapStr.length() > MAX_PREVIEW - 3 )`
`917`	`917`	`{`
`918`	`918`	`mapStr = tr( "%1…" ).arg( mapStr.left( MAX_PREVIEW - 2 ) );`