More tests for json values, fix boolean representation

elpaso · elpaso · commit 660e451f072b · 2019-06-10T09:15:00.000+02:00
diff --git a/src/providers/postgres/qgspostgresconn.cpp b/src/providers/postgres/qgspostgresconn.cpp
@@ -1063,8 +1063,6 @@ QString QgsPostgresConn::quotedJsonValue( const QVariant &value )
 {
   if ( value.isNull() || !value.isValid() )
     return QStringLiteral( "null" );
-  if ( value.type() == QVariant::Bool )
-    return value.toBool() ?  QStringLiteral( "true" ) : QStringLiteral( "false" );
   const auto j { QgsJsonUtils::jsonFromVariant( value ) };
   return quotedString( QString::fromStdString( j.dump() ) );
 }
diff --git a/src/providers/postgres/qgspostgresconn.h b/src/providers/postgres/qgspostgresconn.h
@@ -285,6 +285,7 @@ class QgsPostgresConn : public QObject
 
     /**
      * Quote a json(b) value for placement in a SQL string.
+     * \note a null value will be represented as a NULL and not as a json null.
      */
     static QString quotedJsonValue( const QVariant &value );
 
diff --git a/tests/src/python/test_provider_postgres.py b/tests/src/python/test_provider_postgres.py
@@ -619,9 +619,11 @@ def testJson(self):
 
         attrs = (
             123,
-            None,
-            "String l'iteral with \"quotes\" and other funny chars ;#/",
             1233.45,
+            None,
+            True,
+            False,
+            r"String literal with \"quotes\" 'and' other funny chars []{};#/èé*",
             [1, 2, 3.4, None],
             [True, False],
             {'a': 123, 'b': 123.34, 'c': 'a string', 'd': [1, 2, 3], 'e': {'a': 123, 'b': 123.45}}

Original file line number	Diff line number	Diff line change
`@@ -1063,8 +1063,6 @@ QString QgsPostgresConn::quotedJsonValue( const QVariant &value )`
`1063`	`1063`	`{`
`1064`	`1064`	`if ( value.isNull() \|\| !value.isValid() )`
`1065`	`1065`	`return QStringLiteral( "null" );`
`1066`		`- if ( value.type() == QVariant::Bool )`
`1067`		`- return value.toBool() ? QStringLiteral( "true" ) : QStringLiteral( "false" );`
`1068`	`1066`	`const auto j { QgsJsonUtils::jsonFromVariant( value ) };`
`1069`	`1067`	`return quotedString( QString::fromStdString( j.dump() ) );`
`1070`	`1068`	`}`