Add multiple rows to test, fix bug

dbms/tests/integration/test_external_dictionaries/external_sources.py

@@ -119,7 +119,7 @@ class SourceMySQL(ExternalSource):
         query = 'insert into test.{} ({}) values {}'.format(
             table_name,
             ','.join(self.ordered_names),
-            ''.join(values_strs))
+            ','.join(values_strs))
         self.execute_mysql_query(query)
 
 
@@ -208,7 +208,7 @@ class SourceClickHouse(ExternalSource):
         query = 'INSERT INTO test.{} ({}) values {}'.format(
             table_name,
             ','.join(self.ordered_names),
-            ''.join(values_strs))
+            ','.join(values_strs))
         self.node.query(query)
 
 

dbms/tests/integration/test_external_dictionaries/test.py

@@ -141,9 +141,14 @@ def started_cluster():
 def test_simple_dictionaries(started_cluster):
     fields = FIELDS["simple"]
     data = [
-        Row(fields, [1, 22, 333, 4444, 55555, -6, -77,
-                     -888, -999, '550e8400-e29b-41d4-a716-446655440003',
-                     '1973-06-28', '1985-02-28 23:43:25', 'hello', 22.543, 3332154213.4]),
+        Row(fields,
+            [1, 22, 333, 4444, 55555, -6, -77,
+            -888, -999, '550e8400-e29b-41d4-a716-446655440003',
+            '1973-06-28', '1985-02-28 23:43:25', 'hello', 22.543, 3332154213.4]),
+        Row(fields,
+            [2, 3, 4, 5, 6, -7, -8,
+            -9, -10, '550e8400-e29b-41d4-a716-446655440002',
+            '1978-06-28', '1986-02-28 23:42:25', 'hello', 21.543, 3222154213.4]),
     ]
 
     simple_dicts = [d for d in DICTIONARIES if d.structure.layout.layout_type == "simple"]
@@ -173,10 +178,16 @@ def test_simple_dictionaries(started_cluster):
 def test_complex_dictionaries(started_cluster):
     fields = FIELDS["complex"]
     data = [
-        Row(fields, [1, 'world', 22, 333, 4444, 55555, -6,
-                     -77, -888, -999, '550e8400-e29b-41d4-a716-446655440003',
-                     '1973-06-28', '1985-02-28 23:43:25',
-                     'hello', 22.543, 3332154213.4]),
+        Row(fields,
+            [1, 'world', 22, 333, 4444, 55555, -6,
+            -77, -888, -999, '550e8400-e29b-41d4-a716-446655440003',
+            '1973-06-28', '1985-02-28 23:43:25',
+            'hello', 22.543, 3332154213.4]),
+        Row(fields,
+            [2, 'qwerty2', 52, 2345, 6544, 9191991, -2,
+            -717, -81818, -92929, '550e8400-e29b-41d4-a716-446655440007',
+            '1975-09-28', '2000-02-28 23:33:24',
+            'my', 255.543, 333222154213.4]),
     ]
 
     complex_dicts = [d for d in DICTIONARIES if d.structure.layout.layout_type == "complex"]
@@ -206,11 +217,18 @@ def test_complex_dictionaries(started_cluster):
 def test_ranged_dictionaries(started_cluster):
     fields = FIELDS["ranged"]
     data = [
-        Row(fields, [1, '2019-02-10', '2019-02-01', '2019-02-28',
-                     22, 333, 4444, 55555, -6, -77, -888, -999,
-                     '550e8400-e29b-41d4-a716-446655440003',
-                     '1973-06-28', '1985-02-28 23:43:25', 'hello',
-                     22.543, 3332154213.4]),
+        Row(fields,
+            [1, '2019-02-10', '2019-02-01', '2019-02-28',
+            22, 333, 4444, 55555, -6, -77, -888, -999,
+            '550e8400-e29b-41d4-a716-446655440003',
+            '1973-06-28', '1985-02-28 23:43:25', 'hello',
+            22.543, 3332154213.4]),
+        Row(fields,
+            [1, '2019-04-10', '2019-04-01', '2019-04-28',
+            555, 32323, 414144, 5255515, -65, -747, -8388, -9099,
+            '550e8400-e29b-41d4-a716-446655440004',
+            '1973-06-29', '2002-02-28 23:23:25', '!!!!',
+            32.543, 33321545513.4]),
     ]
 
     ranged_dicts = [d for d in DICTIONARIES if d.structure.layout.layout_type == "ranged"]