Fix cfg::memory tests that used simple scoping (#891)

Author: aljazerzen

tests/test_datetime.py

@@ -101,16 +101,20 @@ async def test_duration_02(self):
 
         # Test encode
         durs_enc = self.client.query('''
-            WITH args := array_unpack(
-                <array<tuple<duration, duration, duration>>>$0)
-            SELECT args.0 + args.1 = args.2;
+            WITH
+              args := array_unpack(
+                <array<tuple<duration, duration, duration>>>$0
+              )
+            FOR a IN args UNION a.0 + a.1 = a.2;
         ''', durs)
 
         # Test decode
         durs_dec = self.client.query('''
-            WITH args := array_unpack(
-                <array<tuple<duration, duration, duration>>>$0)
-            SELECT (args.0 + args.1, args.2);
+            WITH
+              args := array_unpack(
+                <array<tuple<duration, duration, duration>>>$0
+              )
+            FOR a IN args UNION (a.0 + a.1, a.2);
         ''', durs)
 
         self.assertEqual(durs_enc, [True] * len(durs))

tests/test_memory.py

@@ -45,20 +45,19 @@ async def test_config_memory_01(self):
         # Test that ConfigMemory.__str__ formats the
         # same as <str><cfg::memory>
         mem_tuples = self.client.query('''
-            WITH args := array_unpack(<array<str>>$0)
-            SELECT (
-                <cfg::memory>args,
-                <str><cfg::memory>args,
-                <int64><cfg::memory>args
+            FOR a IN array_unpack(<array<str>>$0) UNION
+            (
+                <cfg::memory>a,
+                <str><cfg::memory>a,
+                <int64><cfg::memory>a,
             );
         ''', mem_strs)
 
         mem_vals = [t[0] for t in mem_tuples]
 
         # Test encode/decode roundtrip
         roundtrip = self.client.query('''
-            WITH args := array_unpack(<array<cfg::memory>>$0)
-            SELECT args;
+            SELECT array_unpack(<array<cfg::memory>>$0);
         ''', mem_vals)
 
         self.assertEqual(