Skip to content

Commit b1f0d0e

Browse files
author
kabulov kozim
committed
allow for any directory
1 parent c2eba74 commit b1f0d0e

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

test/test_core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def drop_table(self, base, engine):
117117
base.metadata.drop_all(engine)
118118

119119
def test_directories(self):
120-
engine_good = sa.create_engine(config.db_url, directories=["dir"])
120+
engine_good = sa.create_engine(config.db_url, has_directories=True)
121121
base, Table, session = self.prepare_table(engine_good)
122122
row = self.try_update(session, Table)
123123
assert row.id == 2

ydb_sqlalchemy/sqlalchemy/__init__.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ def __init__(
589589
json_serializer=None,
590590
json_deserializer=None,
591591
_add_declare_for_yql_stmt_vars=False,
592-
directories=[],
592+
has_directories=False,
593593
**kwargs,
594594
):
595595
super().__init__(**kwargs)
@@ -599,7 +599,7 @@ def __init__(
599599
# NOTE: _add_declare_for_yql_stmt_vars is temporary and is soon to be removed.
600600
# no need in declare in yql statement here since ydb 24-1
601601
self._add_declare_for_yql_stmt_vars = _add_declare_for_yql_stmt_vars
602-
self._directories = directories
602+
self._has_directories = has_directories
603603

604604
def _describe_table(self, connection, table_name, schema=None):
605605
if schema is not None:
@@ -682,9 +682,8 @@ def do_commit(self, dbapi_connection: dbapi.Connection) -> None:
682682
dbapi_connection.commit()
683683

684684
def _fix_variable_name(self, variable):
685-
for directory in self._directories:
686-
if variable.startswith(f"{directory}/"):
687-
return f"{directory}_" + variable[len(directory) + 1 :]
685+
if self._has_directories:
686+
return variable.replace("/", "_")
688687
return variable
689688

690689
def _format_variables(

0 commit comments

Comments
 (0)