Skip to content

Commit 1a7875c

Browse files
authored
blackify repo (#10)
1 parent c043036 commit 1a7875c

40 files changed

+4077
-3763
lines changed

setup.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
# limitations under the License.
1515
"""spanner_orm setup file."""
1616
from setuptools import setup
17+
1718
setup(
18-
name='spanner-orm',
19-
version='0.2.8',
20-
description='Basic ORM for Spanner',
21-
maintainer='Aniruddha Maru',
22-
maintainer_email='[email protected]',
23-
url='https://github.com/maroux/python-spanner-orm',
24-
packages=['spanner_orm', 'spanner_orm.admin'],
19+
name="spanner-orm",
20+
version="0.2.8",
21+
description="Basic ORM for Spanner",
22+
maintainer="Aniruddha Maru",
23+
maintainer_email="[email protected]",
24+
url="https://github.com/maroux/python-spanner-orm",
25+
packages=["spanner_orm", "spanner_orm.admin"],
2526
include_package_data=True,
26-
python_requires='~=3.7',
27-
install_requires=['google-cloud-spanner >= 1.6, <2.0.0dev'],
28-
tests_require=['absl-py'],
29-
entry_points={
30-
'console_scripts': ['spanner-orm = spanner_orm.admin.scripts:main']
31-
})
27+
python_requires="~=3.7",
28+
install_requires=["google-cloud-spanner >= 1.6, <2.0.0dev"],
29+
tests_require=["absl-py"],
30+
entry_points={"console_scripts": ["spanner-orm = spanner_orm.admin.scripts:main"]},
31+
)

spanner_orm/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,6 @@
106106
MigrationExecutor = migration_executor.MigrationExecutor
107107

108108
try:
109-
__import__('pkg_resources').declare_namespace('spanner_orm')
109+
__import__("pkg_resources").declare_namespace("spanner_orm")
110110
except ImportError:
111-
__path__ = __import__('pkgutil').extend_path(__path__, 'spanner_orm')
111+
__path__ = __import__("pkgutil").extend_path(__path__, "spanner_orm")

spanner_orm/admin/api.py

Lines changed: 40 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -24,59 +24,62 @@
2424

2525

2626
class SpannerAdminApi(api.SpannerReadApi, api.SpannerWriteApi):
27-
"""Manages table schema information on Spanner."""
27+
"""Manages table schema information on Spanner."""
2828

29-
def __init__(self, connection: api.SpannerConnection):
30-
self._spanner_connection = connection
29+
def __init__(self, connection: api.SpannerConnection):
30+
self._spanner_connection = connection
3131

32-
@property
33-
def _connection(self) -> spanner_database.Database:
34-
return self._spanner_connection.database
32+
@property
33+
def _connection(self) -> spanner_database.Database:
34+
return self._spanner_connection.database
3535

36-
def create_database(self) -> None:
37-
operation = self._connection.create()
38-
operation.result()
36+
def create_database(self) -> None:
37+
operation = self._connection.create()
38+
operation.result()
3939

40-
def drop_database(self) -> None:
41-
self._connection.drop()
40+
def drop_database(self) -> None:
41+
self._connection.drop()
4242

43-
def update_schema(self, change: str) -> None:
44-
operation = self._connection.update_ddl([change])
45-
operation.result()
43+
def update_schema(self, change: str) -> None:
44+
operation = self._connection.update_ddl([change])
45+
operation.result()
4646

4747

4848
_admin_api = None
4949

5050

51-
def connect(instance: str,
52-
database: str,
53-
project: Optional[str] = None,
54-
credentials: Optional[auth_credentials.Credentials] = None,
55-
pool: Optional[spanner_pool.AbstractSessionPool] = None,
56-
create_ddl: Optional[Iterable[str]] = None) -> SpannerAdminApi:
57-
"""Connects the global Spanner admin API to a Spanner database."""
58-
connection = api.SpannerConnection(
59-
instance,
60-
database,
61-
project=project,
62-
credentials=credentials,
63-
pool=pool,
64-
create_ddl=create_ddl)
65-
return from_connection(connection)
51+
def connect(
52+
instance: str,
53+
database: str,
54+
project: Optional[str] = None,
55+
credentials: Optional[auth_credentials.Credentials] = None,
56+
pool: Optional[spanner_pool.AbstractSessionPool] = None,
57+
create_ddl: Optional[Iterable[str]] = None,
58+
) -> SpannerAdminApi:
59+
"""Connects the global Spanner admin API to a Spanner database."""
60+
connection = api.SpannerConnection(
61+
instance,
62+
database,
63+
project=project,
64+
credentials=credentials,
65+
pool=pool,
66+
create_ddl=create_ddl,
67+
)
68+
return from_connection(connection)
6669

6770

6871
def from_connection(connection: api.SpannerConnection) -> SpannerAdminApi:
69-
global _admin_api
70-
_admin_api = SpannerAdminApi(connection)
71-
return _admin_api
72+
global _admin_api
73+
_admin_api = SpannerAdminApi(connection)
74+
return _admin_api
7275

7376

7477
def hangup() -> None:
75-
global _admin_api
76-
_admin_api = None
78+
global _admin_api
79+
_admin_api = None
7780

7881

7982
def spanner_admin_api() -> SpannerAdminApi:
80-
if not _admin_api:
81-
raise error.SpannerError('Must connect to Spanner before calling APIs')
82-
return _admin_api
83+
if not _admin_api:
84+
raise error.SpannerError("Must connect to Spanner before calling APIs")
85+
return _admin_api

spanner_orm/admin/column.py

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,27 @@
2222

2323

2424
class ColumnSchema(schema.InformationSchema):
25-
"""Model for interacting with Spanner column schema table."""
26-
27-
__table__ = 'information_schema.columns'
28-
table_catalog = field.Field(field.String, primary_key=True)
29-
table_schema = field.Field(field.String, primary_key=True)
30-
table_name = field.Field(field.String, primary_key=True)
31-
column_name = field.Field(field.String, primary_key=True)
32-
ordinal_position = field.Field(field.Integer)
33-
is_nullable = field.Field(field.String)
34-
spanner_type = field.Field(field.String)
35-
36-
@property
37-
def nullable(self) -> bool:
38-
return self.is_nullable == 'YES'
39-
40-
@property
41-
def field_type(self) -> Type[field.FieldType]:
42-
for field_type in field.ALL_TYPES:
43-
if self.spanner_type == field_type.ddl():
44-
return field_type
45-
46-
raise error.SpannerError('No corresponding Type for {}'.format(
47-
self.spanner_type))
25+
"""Model for interacting with Spanner column schema table."""
26+
27+
__table__ = "information_schema.columns"
28+
table_catalog = field.Field(field.String, primary_key=True)
29+
table_schema = field.Field(field.String, primary_key=True)
30+
table_name = field.Field(field.String, primary_key=True)
31+
column_name = field.Field(field.String, primary_key=True)
32+
ordinal_position = field.Field(field.Integer)
33+
is_nullable = field.Field(field.String)
34+
spanner_type = field.Field(field.String)
35+
36+
@property
37+
def nullable(self) -> bool:
38+
return self.is_nullable == "YES"
39+
40+
@property
41+
def field_type(self) -> Type[field.FieldType]:
42+
for field_type in field.ALL_TYPES:
43+
if self.spanner_type == field_type.ddl():
44+
return field_type
45+
46+
raise error.SpannerError(
47+
"No corresponding Type for {}".format(self.spanner_type)
48+
)

spanner_orm/admin/index.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919

2020

2121
class IndexSchema(schema.InformationSchema):
22-
"""Model for interacting with Spanner index schema table."""
22+
"""Model for interacting with Spanner index schema table."""
2323

24-
__table__ = 'information_schema.indexes'
25-
table_catalog = field.Field(field.String, primary_key=True)
26-
table_schema = field.Field(field.String, primary_key=True)
27-
table_name = field.Field(field.String, primary_key=True)
28-
index_name = field.Field(field.String, primary_key=True)
29-
index_type = field.Field(field.String)
30-
parent_table_name = field.Field(field.String, nullable=True)
31-
is_unique = field.Field(field.Boolean)
32-
is_null_filtered = field.Field(field.Boolean)
33-
index_state = field.Field(field.String)
24+
__table__ = "information_schema.indexes"
25+
table_catalog = field.Field(field.String, primary_key=True)
26+
table_schema = field.Field(field.String, primary_key=True)
27+
table_name = field.Field(field.String, primary_key=True)
28+
index_name = field.Field(field.String, primary_key=True)
29+
index_type = field.Field(field.String)
30+
parent_table_name = field.Field(field.String, nullable=True)
31+
is_unique = field.Field(field.Boolean)
32+
is_null_filtered = field.Field(field.Boolean)
33+
index_state = field.Field(field.String)

spanner_orm/admin/index_column.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919

2020

2121
class IndexColumnSchema(schema.InformationSchema):
22-
"""Model for interacting with Spanner index column schema table."""
22+
"""Model for interacting with Spanner index column schema table."""
2323

24-
__table__ = 'information_schema.index_columns'
25-
table_catalog = field.Field(field.String, primary_key=True)
26-
table_schema = field.Field(field.String, primary_key=True)
27-
table_name = field.Field(field.String, primary_key=True)
28-
index_name = field.Field(field.String, primary_key=True)
29-
column_name = field.Field(field.String, primary_key=True)
30-
ordinal_position = field.Field(field.Integer, nullable=True)
31-
column_ordering = field.Field(field.String, nullable=True)
32-
is_nullable = field.Field(field.String)
33-
spanner_type = field.Field(field.String)
24+
__table__ = "information_schema.index_columns"
25+
table_catalog = field.Field(field.String, primary_key=True)
26+
table_schema = field.Field(field.String, primary_key=True)
27+
table_name = field.Field(field.String, primary_key=True)
28+
index_name = field.Field(field.String, primary_key=True)
29+
column_name = field.Field(field.String, primary_key=True)
30+
ordinal_position = field.Field(field.Integer, nullable=True)
31+
column_ordering = field.Field(field.String, nullable=True)
32+
is_nullable = field.Field(field.String)
33+
spanner_type = field.Field(field.String)

0 commit comments

Comments
 (0)