aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhhell <hhell@yandex-team.ru>2022-02-10 16:48:42 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:48:42 +0300
commitb7ab27e918daba97b35229b3238fe218253f6398 (patch)
tree5d5cb817648f650d76cf1076100726fd9b8448e8
parent9d1404c854039e8792b0349106c2903b485a5fe8 (diff)
downloadydb-b7ab27e918daba97b35229b3238fe218253f6398.tar.gz
Restoring authorship annotation for <hhell@yandex-team.ru>. Commit 2 of 2.
-rw-r--r--build/rules/contrib_python.policy2
-rw-r--r--contrib/python/ya.make6
-rw-r--r--ydb/public/sdk/python/CHANGELOG.md8
-rw-r--r--ydb/public/sdk/python/ydb/sqlalchemy/__init__.py32
4 files changed, 24 insertions, 24 deletions
diff --git a/build/rules/contrib_python.policy b/build/rules/contrib_python.policy
index 3d25207a646..60fd1497533 100644
--- a/build/rules/contrib_python.policy
+++ b/build/rules/contrib_python.policy
@@ -258,7 +258,7 @@ DENY .* -> contrib/java/patched
ALLOW travel/avia -> contrib/python/pymqi
DENY .* -> contrib/python/pymqi
-# https://st.yandex-team.ru/CONTRIB-1839
+# https://st.yandex-team.ru/CONTRIB-1839
ALLOW datalens/backend/app/dls -> contrib/python/quart
DENY .* -> contrib/python/quart
diff --git a/contrib/python/ya.make b/contrib/python/ya.make
index dbad481cf14..d01ced9f3aa 100644
--- a/contrib/python/ya.make
+++ b/contrib/python/ya.make
@@ -406,7 +406,7 @@ RECURSE(
flask-restplus
flask-restx
Flask-Script
- flask-shell-ipython
+ flask-shell-ipython
Flask-Shelve
Flask-SQLAlchemy
Flask-SSLify
@@ -935,7 +935,7 @@ RECURSE(
rdflib
readabilipy
redis
- redis-cache-lock
+ redis-cache-lock
regex
reportlab
repoze.lru
@@ -1170,7 +1170,7 @@ RECURSE(
xlwt
xmlsec
xmltodict
- xxhash
+ xxhash
yandex-pgmigrate
yappi
yarl
diff --git a/ydb/public/sdk/python/CHANGELOG.md b/ydb/public/sdk/python/CHANGELOG.md
index a43df640c4e..139ce6f71fc 100644
--- a/ydb/public/sdk/python/CHANGELOG.md
+++ b/ydb/public/sdk/python/CHANGELOG.md
@@ -31,10 +31,10 @@
* fix bug with prepare in aio
-## 1.0.26 ##
-
-* allow specifying column labels in group by in the sqlalchemy dialect
-
+## 1.0.26 ##
+
+* allow specifying column labels in group by in the sqlalchemy dialect
+
## 1.0.25 ##
* add SEQUENCE to known schema types
diff --git a/ydb/public/sdk/python/ydb/sqlalchemy/__init__.py b/ydb/public/sdk/python/ydb/sqlalchemy/__init__.py
index 6ec977d88d2..7815a28df22 100644
--- a/ydb/public/sdk/python/ydb/sqlalchemy/__init__.py
+++ b/ydb/public/sdk/python/ydb/sqlalchemy/__init__.py
@@ -25,9 +25,9 @@ try:
from sqlalchemy.util.compat import inspect_getfullargspec
from sqlalchemy.sql import literal_column
- SQLALCHEMY_VERSION = tuple(sa.__version__.split("."))
- SA_14 = SQLALCHEMY_VERSION >= ("1", "4")
-
+ SQLALCHEMY_VERSION = tuple(sa.__version__.split("."))
+ SA_14 = SQLALCHEMY_VERSION >= ("1", "4")
+
class YqlIdentifierPreparer(IdentifierPreparer):
def __init__(self, dialect):
super(YqlIdentifierPreparer, self).__init__(
@@ -80,11 +80,11 @@ try:
).self_group()
class YqlCompiler(SQLCompiler):
- def group_by_clause(self, select, **kw):
- # Hack to ensure it is possible to define labels in groupby.
- kw.update(within_columns_clause=True)
- return super(YqlCompiler, self).group_by_clause(select, **kw)
-
+ def group_by_clause(self, select, **kw):
+ # Hack to ensure it is possible to define labels in groupby.
+ kw.update(within_columns_clause=True)
+ return super(YqlCompiler, self).group_by_clause(select, **kw)
+
def visit_lambda(self, lambda_, **kw):
func = lambda_.func
spec = inspect_getfullargspec(func)
@@ -227,10 +227,10 @@ try:
return ydb.dbapi
- def _check_unicode_returns(self, *args, **kwargs):
- # Normally, this would do 2 SQL queries, which isn't quite necessary.
+ def _check_unicode_returns(self, *args, **kwargs):
+ # Normally, this would do 2 SQL queries, which isn't quite necessary.
return "conditional"
-
+
def get_columns(self, connection, table_name, schema=None, **kw):
if schema is not None:
raise NotSupportedError
@@ -240,11 +240,11 @@ try:
else:
qt = table_name
- if SA_14:
- raw_conn = connection.connection
- else:
- raw_conn = connection.raw_connection()
- columns = raw_conn.describe(qt)
+ if SA_14:
+ raw_conn = connection.connection
+ else:
+ raw_conn = connection.raw_connection()
+ columns = raw_conn.describe(qt)
as_compatible = []
for column in columns:
as_compatible.append(