tinybird-toolset 2.4.5__tar.gz → 2.4.7__tar.gz

{tinybird_toolset-2.4.5/src/tinybird_toolset.egg-info → tinybird_toolset-2.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tinybird-toolset
-Version: 2.4.5
+Version: 2.4.7
 Home-page: https://gitlab.com/tinybird/clickhouse-toolset
 Author: Tinybird.co
 Author-email: support@tinybird.co

{tinybird_toolset-2.4.5 → tinybird_toolset-2.4.7}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, Extension
 
 NAME = 'tinybird-toolset'
-VERSION = '2.4.5'
+VERSION = '2.4.7'
 
 try:
     from conf import *

{tinybird_toolset-2.4.5 → tinybird_toolset-2.4.7/src/tinybird_toolset.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tinybird-toolset
-Version: 2.4.5
+Version: 2.4.7
 Home-page: https://gitlab.com/tinybird/clickhouse-toolset
 Author: Tinybird.co
 Author-email: support@tinybird.co

{tinybird_toolset-2.4.5 → tinybird_toolset-2.4.7}/tests/test_convert_to_row_binary.py

@@ -8408,6 +8408,22 @@ TEST_CASES = [
         b'',
         b"\x00\x00\x03abc\x00\x00\x05wrong\x00\x01ZInvalid value wrong for type 'Int8' in column 'wrong_value' with jsonpath '$.wrong_value'.\x00\x01\x0bwrong_value\x01\x01",
         0, 1),
+
+    # Non-standard but existing behaviour: on duplicate JSON keys, first occurrence wins
+    (ConversionMode.ALWAYS,
+        [('a', 'String', '$.a', False)],
+        '{"a":"x1","a":"x2"}',
+        b'\x00\x02x1',
+        b'',
+        1, 0),
+
+    # Existing behaviour: JSONPaths do not match their encoded keys
+    (ConversionMode.ALWAYS,
+        [('a', 'String', '$.a', False)],
+        '{"\\u0061":"x1"}',
+        b'',
+        b"\x01\x00\x01\xa7\x01Strict type checking failed. Object does not have column 'a', you should send a value or recreate the table with a Nullable column type. While accessing jsonpath \'$.a\'\x00\x01\x01a\x01\x01",
+        0, 1),
 ]
 
 

{tinybird_toolset-2.4.5 → tinybird_toolset-2.4.7}/tests/test_replace_tables.py

@@ -420,6 +420,58 @@ class TestReplaceTables(unittest.TestCase):
         """
         self.assertEqual(replaced, chquery.format(expected_query))
 
+    def test_column_uses_alias_source_different_from_from(self):
+        """When the same target table has multiple source keys registered
+        (e.g., workspace name and CH database name both pointing to the same
+        physical table), a column qualified with one alias must still be
+        rewritten even if the FROM matched a different alias key."""
+        sql = "SELECT acme.events.id FROM events"
+        replacements = {
+            ("d_userdb", "events"): ("d_userdb", "t_xxx"),
+            ("acme", "events"): ("d_userdb", "t_xxx"),
+        }
+        expected_query = "SELECT d_userdb.t_xxx.id FROM d_userdb.t_xxx AS events"
+        replaced = chquery.replace_tables(
+            sql, replacements, default_database="d_userdb"
+        )
+        self.assertEqual(replaced, chquery.format(expected_query))
+
+    def test_self_join_with_subquery_target(self):
+        """Self-join of a datasource that is replaced by a subquery. Each FROM
+        leg gets its own cloned subquery and its own SQL alias; columns
+        qualified by the SQL alias must keep their per-leg binding."""
+        sql = """
+            SELECT prev.value, curr.value
+            FROM workspace_name.events AS prev
+            JOIN workspace_name.events AS curr ON curr.id = prev.id + 1
+        """
+        replacements = {
+            ("workspace_name", "events"): ("", "(SELECT * FROM raw_events)"),
+            ("d_yyy", "events"): ("", "(SELECT * FROM raw_events)"),
+        }
+        expected_query = """
+            SELECT prev.value, curr.value
+            FROM (SELECT * FROM raw_events) AS prev
+            INNER JOIN (SELECT * FROM raw_events) AS curr ON curr.id = (prev.id + 1)
+        """
+        replaced = chquery.replace_tables(
+            sql, replacements, default_database="d_yyy"
+        )
+        self.assertEqual(replaced, chquery.format(expected_query))
+
+    def test_qualified_asterisk_uses_alias_source_different_from_from(self):
+        """Same as above but for qualified asterisks: SELECT acme.events.*"""
+        sql = "SELECT acme.events.* FROM events"
+        replacements = {
+            ("d_userdb", "events"): ("d_userdb", "t_xxx"),
+            ("acme", "events"): ("d_userdb", "t_xxx"),
+        }
+        expected_query = "SELECT d_userdb.t_xxx.* FROM d_userdb.t_xxx AS events"
+        replaced = chquery.replace_tables(
+            sql, replacements, default_database="d_userdb"
+        )
+        self.assertEqual(replaced, chquery.format(expected_query))
+
     def test_qualified_column_in_array(self):
         sql = """SELECT array(join_test.id) FROM default.join_test"""