Skip to content

Commit

Permalink
Merge pull request #44 from tamagoko/template-generators-sets
Browse files Browse the repository at this point in the history
adding set check when iterating creating parameters
  • Loading branch information
tamagoko authored Jan 10, 2024
2 parents 696a60f + 00078a7 commit 66d8a40
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
2 changes: 1 addition & 1 deletion dysql/query_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def _parameterize_inner_list(
) -> Tuple[str, Optional[dict]]:
param_values = {}
parameterized_keys = []
if not isinstance(values, (list, tuple)):
if not isinstance(values, (list, tuple, set)):
param_values[key] = values
parameterized_keys.append(key)
else:
Expand Down
25 changes: 25 additions & 0 deletions dysql/test/test_template_generators.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class TestTemplatesGenerators:

number_values = [1, 2, 3, 4]
string_values = ["1", "2", "3", "4"]
set_values = {1, 2, 3, 4}
insert_values = [("ironman", 1), ("batman", 2)]
tuple_values = [(1, 2), (3, 4)]
query = "column_a IN ( :column_a_0, :column_a_1, :column_a_2, :column_a_3 )"
Expand All @@ -43,6 +44,12 @@ class TestTemplatesGenerators:
number_values,
query_with_table,
),
(
TemplateGenerators.in_column,
"table.column_a",
set_values,
query_with_table,
),
(TemplateGenerators.in_column, "column_a", string_values, query),
(
TemplateGenerators.in_column,
Expand Down Expand Up @@ -77,6 +84,12 @@ class TestTemplatesGenerators:
string_values,
not_query_with_table,
),
(
TemplateGenerators.not_in_column,
"table.column_a",
set_values,
not_query_with_table,
),
(TemplateGenerators.not_in_column, "column_a", [], "1 = 1"),
(
TemplateGenerators.values,
Expand Down Expand Up @@ -120,6 +133,12 @@ class TestTemplatesGenerators:
number_values,
parameter_numbers,
),
(
TemplateGenerators.in_column,
"column_a",
set_values,
parameter_numbers,
),
(
TemplateGenerators.in_column,
"table.column_a",
Expand Down Expand Up @@ -157,6 +176,12 @@ class TestTemplatesGenerators:
string_values,
parameter_strings,
),
(
TemplateGenerators.not_in_column,
"column_a",
set_values,
parameter_numbers,
),
(
TemplateGenerators.not_in_column,
"table.column_a",
Expand Down

0 comments on commit 66d8a40

Please sign in to comment.