Skip to content

Commit

Permalink
escape map names
Browse files Browse the repository at this point in the history
  • Loading branch information
@mdumandag
mdumandag committed Aug 31, 2021
1 parent f3a4977 commit 3d221bb
Showing 1 changed file with 34 additions and 34 deletions.
68 changes: 34 additions & 34 deletions tests/integration/backward_compatible/sql_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ def test_execute(self):
self._create_mapping()
entry_count = 11
self._populate_map(entry_count)
result = self.client.sql.execute("SELECT * FROM %s" % self.map_name)
result = self.client.sql.execute('SELECT * FROM "%s"' % self.map_name)
six.assertCountEqual(
self,
[(i, i) for i in range(entry_count)],
Expand All @@ -165,7 +165,7 @@ def test_execute_with_params(self):
entry_count = 13
self._populate_map(entry_count)
result = self.client.sql.execute(
"SELECT this FROM %s WHERE __key > ? AND this > ?" % self.map_name, 5, 6
'SELECT this FROM "%s" WHERE __key > ? AND this > ?' % self.map_name, 5, 6
)
six.assertCountEqual(
self,
Expand All @@ -177,7 +177,7 @@ def test_execute_with_mismatched_params_when_sql_has_more(self):
self._create_mapping()
self._populate_map()
result = self.client.sql.execute(
"SELECT * FROM %s WHERE __key > ? AND this > ?" % self.map_name, 5
'SELECT * FROM "%s" WHERE __key > ? AND this > ?' % self.map_name, 5
)

with self.assertRaises(HazelcastSqlError):
Expand All @@ -187,7 +187,7 @@ def test_execute_with_mismatched_params_when_sql_has_more(self):
def test_execute_with_mismatched_params_when_params_has_more(self):
self._create_mapping()
self._populate_map()
result = self.client.sql.execute("SELECT * FROM %s WHERE this > ?" % self.map_name, 5, 6)
result = self.client.sql.execute('SELECT * FROM "%s" WHERE this > ?' % self.map_name, 5, 6)

with self.assertRaises(HazelcastSqlError):
for _ in result:
Expand All @@ -197,7 +197,7 @@ def test_execute_statement(self):
self._create_mapping("VARCHAR")
entry_count = 12
self._populate_map(entry_count, str)
statement = SqlStatement("SELECT this FROM %s" % self.map_name)
statement = SqlStatement('SELECT this FROM "%s"' % self.map_name)
result = self.client.sql.execute_statement(statement)

six.assertCountEqual(
Expand All @@ -211,7 +211,7 @@ def test_execute_statement_with_params(self):
entry_count = 20
self._populate_map(entry_count, lambda v: Student(v, v))
statement = SqlStatement(
"SELECT age FROM %s WHERE height = CAST(? AS REAL)" % self.map_name
'SELECT age FROM "%s" WHERE height = CAST(? AS REAL)' % self.map_name
)
statement.add_parameter(13.0)
result = self.client.sql.execute_statement(statement)
Expand All @@ -221,7 +221,7 @@ def test_execute_statement_with_params(self):
def test_execute_statement_with_mismatched_params_when_sql_has_more(self):
self._create_mapping()
self._populate_map()
statement = SqlStatement("SELECT * FROM %s WHERE __key > ? AND this > ?" % self.map_name)
statement = SqlStatement('SELECT * FROM "%s" WHERE __key > ? AND this > ?' % self.map_name)
statement.parameters = [5]
result = self.client.sql.execute_statement(statement)

Expand All @@ -232,7 +232,7 @@ def test_execute_statement_with_mismatched_params_when_sql_has_more(self):
def test_execute_statement_with_mismatched_params_when_params_has_more(self):
self._create_mapping()
self._populate_map()
statement = SqlStatement("SELECT * FROM %s WHERE this > ?" % self.map_name)
statement = SqlStatement('SELECT * FROM "%s" WHERE this > ?' % self.map_name)
statement.parameters = [5, 6]
result = self.client.sql.execute_statement(statement)

Expand All @@ -244,7 +244,7 @@ def test_execute_statement_with_timeout(self):
self._create_mapping_for_portable(666, 6, {"age": "BIGINT", "height": "REAL"})
entry_count = 100
self._populate_map(entry_count, lambda v: Student(v, v))
statement = SqlStatement("SELECT age FROM %s WHERE height < 10" % self.map_name)
statement = SqlStatement('SELECT age FROM "%s" WHERE height < 10' % self.map_name)
statement.timeout = 100
result = self.client.sql.execute_statement(statement)

Expand All @@ -256,7 +256,7 @@ def test_execute_statement_with_cursor_buffer_size(self):
self._create_mapping_for_portable(666, 6, {"age": "BIGINT", "height": "REAL"})
entry_count = 50
self._populate_map(entry_count, lambda v: Student(v, v))
statement = SqlStatement("SELECT age FROM %s" % self.map_name)
statement = SqlStatement('SELECT age FROM "%s"' % self.map_name)
statement.cursor_buffer_size = 3
result = self.client.sql.execute_statement(statement)

Expand All @@ -272,7 +272,7 @@ def test_execute_statement_with_cursor_buffer_size(self):
def test_execute_statement_with_copy(self):
self._create_mapping()
self._populate_map()
statement = SqlStatement("SELECT __key FROM %s WHERE this >= ?" % self.map_name)
statement = SqlStatement('SELECT __key FROM "%s" WHERE this >= ?' % self.map_name)
statement.parameters = [9]
copy_statement = statement.copy()
statement.clear_parameters()
Expand All @@ -291,7 +291,7 @@ def test_execute_statement_with_expected_result_type_of_rows_when_rows_are_expec
self._create_mapping_for_portable(666, 6, {"age": "BIGINT", "height": "REAL"})
entry_count = 100
self._populate_map(entry_count, lambda v: Student(v, v))
statement = SqlStatement("SELECT age FROM %s WHERE age < 3" % self.map_name)
statement = SqlStatement('SELECT age FROM "%s" WHERE age < 3' % self.map_name)
statement.expected_result_type = SqlExpectedResultType.ROWS
result = self.client.sql.execute_statement(statement)

Expand All @@ -304,7 +304,7 @@ def test_execute_statement_with_expected_result_type_of_update_count_when_rows_a
):
self._create_mapping()
self._populate_map()
statement = SqlStatement("SELECT * FROM %s" % self.map_name)
statement = SqlStatement('SELECT * FROM "%s"' % self.map_name)
statement.expected_result_type = SqlExpectedResultType.UPDATE_COUNT
result = self.client.sql.execute_statement(statement)

Expand All @@ -323,7 +323,7 @@ class SqlResultTest(SqlTestBase):
def test_blocking_iterator(self):
self._create_mapping()
self._populate_map()
result = self.client.sql.execute("SELECT __key FROM %s" % self.map_name)
result = self.client.sql.execute('SELECT __key FROM "%s"' % self.map_name)

six.assertCountEqual(
self, [i for i in range(10)], [row.get_object_with_index(0) for row in result]
Expand All @@ -332,7 +332,7 @@ def test_blocking_iterator(self):
def test_blocking_iterator_when_iterator_requested_more_than_once(self):
self._create_mapping()
self._populate_map()
result = self.client.sql.execute("SELECT this FROM %s" % self.map_name)
result = self.client.sql.execute('SELECT this FROM "%s"' % self.map_name)

six.assertCountEqual(
self, [i for i in range(10)], [row.get_object_with_index(0) for row in result]
Expand All @@ -345,7 +345,7 @@ def test_blocking_iterator_when_iterator_requested_more_than_once(self):
def test_blocking_iterator_with_multi_paged_result(self):
self._create_mapping()
self._populate_map()
statement = SqlStatement("SELECT __key FROM %s" % self.map_name)
statement = SqlStatement('SELECT __key FROM "%s"' % self.map_name)
statement.cursor_buffer_size = 1 # Each page will contain just 1 result
result = self.client.sql.execute_statement(statement)

Expand All @@ -356,7 +356,7 @@ def test_blocking_iterator_with_multi_paged_result(self):
def test_iterator(self):
self._create_mapping()
self._populate_map()
result = self.client.sql.execute("SELECT __key FROM %s" % self.map_name)
result = self.client.sql.execute('SELECT __key FROM "%s"' % self.map_name)

iterator_future = result.iterator()

Expand Down Expand Up @@ -389,7 +389,7 @@ def assertion():
def test_iterator_when_iterator_requested_more_than_once(self):
self._create_mapping()
self._populate_map()
result = self.client.sql.execute("SELECT this FROM %s" % self.map_name)
result = self.client.sql.execute('SELECT this FROM "%s"' % self.map_name)

iterator = result.iterator().result()

Expand All @@ -409,7 +409,7 @@ def test_iterator_when_iterator_requested_more_than_once(self):
def test_iterator_with_multi_paged_result(self):
self._create_mapping()
self._populate_map()
statement = SqlStatement("SELECT __key FROM %s" % self.map_name)
statement = SqlStatement('SELECT __key FROM "%s"' % self.map_name)
statement.cursor_buffer_size = 1 # Each page will contain just 1 result
result = self.client.sql.execute_statement(statement)

Expand All @@ -428,7 +428,7 @@ def test_iterator_with_multi_paged_result(self):
def test_request_blocking_iterator_after_iterator(self):
self._create_mapping()
self._populate_map()
result = self.client.sql.execute("SELECT * FROM %s" % self.map_name)
result = self.client.sql.execute('SELECT * FROM "%s"' % self.map_name)

result.iterator().result()

Expand All @@ -439,7 +439,7 @@ def test_request_blocking_iterator_after_iterator(self):
def test_request_iterator_after_blocking_iterator(self):
self._create_mapping()
self._populate_map()
result = self.client.sql.execute("SELECT * FROM %s" % self.map_name)
result = self.client.sql.execute('SELECT * FROM "%s"' % self.map_name)

for _ in result:
pass
Expand All @@ -452,21 +452,21 @@ def test_request_iterator_after_blocking_iterator(self):
def test_is_row_set_when_row_is_set(self):
self._create_mapping()
self._populate_map()
result = self.client.sql.execute("SELECT * FROM %s" % self.map_name)
result = self.client.sql.execute('SELECT * FROM "%s"' % self.map_name)
self.assertTrue(result.is_row_set().result())

# Can't test the case we would expect a non-negative updated count, because the IMDG SQL
# engine does not support update/insert queries now.
def test_update_count_when_there_is_no_update(self):
self._create_mapping()
self._populate_map()
result = self.client.sql.execute("SELECT * FROM %s WHERE __key > 5" % self.map_name)
result = self.client.sql.execute('SELECT * FROM "%s" WHERE __key > 5' % self.map_name)
self.assertEqual(-1, result.update_count().result())

def test_get_row_metadata(self):
self._create_mapping("VARCHAR")
self._populate_map(value_factory=str)
result = self.client.sql.execute("SELECT __key, this FROM %s" % self.map_name)
result = self.client.sql.execute('SELECT __key, this FROM "%s"' % self.map_name)
row_metadata = result.get_row_metadata().result()
self.assertEqual(2, row_metadata.column_count)
columns = row_metadata.columns
Expand All @@ -478,15 +478,15 @@ def test_get_row_metadata(self):
def test_close_after_query_execution(self):
self._create_mapping()
self._populate_map()
result = self.client.sql.execute("SELECT * FROM %s" % self.map_name)
result = self.client.sql.execute('SELECT * FROM "%s"' % self.map_name)
for _ in result:
pass
self.assertIsNone(result.close().result())

def test_close_when_query_is_active(self):
self._create_mapping()
self._populate_map()
statement = SqlStatement("SELECT * FROM %s " % self.map_name)
statement = SqlStatement('SELECT * FROM "%s"' % self.map_name)
statement.cursor_buffer_size = 1 # Each page will contain 1 row
result = self.client.sql.execute_statement(statement)

Expand All @@ -503,15 +503,15 @@ def test_close_when_query_is_active(self):
def test_with_statement(self):
self._create_mapping()
self._populate_map()
with self.client.sql.execute("SELECT this FROM %s" % self.map_name) as result:
with self.client.sql.execute('SELECT this FROM "%s"' % self.map_name) as result:
six.assertCountEqual(
self, [i for i in range(10)], [row.get_object_with_index(0) for row in result]
)

def test_with_statement_when_iteration_throws(self):
self._create_mapping()
self._populate_map()
statement = SqlStatement("SELECT this FROM %s" % self.map_name)
statement = SqlStatement('SELECT this FROM "%s"' % self.map_name)
statement.cursor_buffer_size = 1 # so that it doesn't close immediately

with self.assertRaises(RuntimeError):
Expand Down Expand Up @@ -670,7 +670,7 @@ def value_factory(key):
def test_null(self):
self._create_mapping("INTEGER")
self._populate_map()
result = self.client.sql.execute("SELECT __key, NULL AS this FROM %s" % self.map_name)
result = self.client.sql.execute('SELECT __key, NULL AS this FROM "%s"' % self.map_name)
self._validate_result(result, SqlColumnType.NULL, lambda _: None)

def test_object(self):
Expand All @@ -679,19 +679,19 @@ def value_factory(key):

self._create_mapping_for_portable(666, 6, {"age": "BIGINT", "height": "REAL"})
self._populate_map(value_factory=value_factory)
result = self.client.sql.execute("SELECT __key, this FROM %s" % self.map_name)
result = self.client.sql.execute('SELECT __key, this FROM "%s"' % self.map_name)
self._validate_result(result, SqlColumnType.OBJECT, value_factory)

def test_null_only_column(self):
self._create_mapping("INTEGER")
self._populate_map()
result = self.client.sql.execute(
"SELECT __key, CAST(NULL AS INTEGER) as this FROM %s" % self.map_name
'SELECT __key, CAST(NULL AS INTEGER) as this FROM "%s"' % self.map_name
)
self._validate_result(result, SqlColumnType.INTEGER, lambda _: None)

def _validate_rows(self, expected_type, value_factory=lambda key: key):
result = self.client.sql.execute("SELECT __key, this FROM %s " % self.map_name)
result = self.client.sql.execute('SELECT __key, this FROM "%s"' % self.map_name)
self._validate_result(result, expected_type, value_factory)

def _validate_result(self, result, expected_type, factory):
Expand Down Expand Up @@ -884,7 +884,7 @@ def test_streaming_sql_query(self):
def test_federated_query(self):
query = (
"""
CREATE MAPPING %s (
CREATE MAPPING "%s" (
__key INT,
name VARCHAR,
age INT
Expand All @@ -903,7 +903,7 @@ def test_federated_query(self):

insert_into_query = (
"""
INSERT INTO %s (__key, name, age)
INSERT INTO "%s" (__key, name, age)
VALUES (1, 'John', 42)
"""
% self.map_name
Expand Down

0 comments on commit 3d221bb

Please sign in to comment.