Skip to content

Commit b9b9191

Browse files
sabrina-gissellesabrina-gisselle
authored
Spanner orm upgrade (#195)
1 parent 01171e7 commit b9b9191

10 files changed

Lines changed: 33 additions & 36 deletions

File tree

‎.github/workflows/test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
pip install \
4646
absl-py \
4747
google-api-core \
48-
'google-cloud-spanner >= 2, <4' \
48+
'google-cloud-spanner >= 3, <4' \
4949
immutabledict \
5050
portpicker \
5151
pytest

‎setup.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
setup(
1818
name='spanner-orm',
19-
version='0.2.0',
19+
version='0.3.0',
2020
description='Basic ORM for Spanner',
2121
maintainer='Python Spanner ORM developers',
2222
maintainer_email='python-spanner-orm@google.com',
@@ -25,7 +25,7 @@
2525
include_package_data=True,
2626
python_requires='~=3.8',
2727
install_requires=[
28-
'google-cloud-spanner >= 2, <4',
28+
'google-cloud-spanner >= 3, <4',
2929
'immutabledict',
3030
],
3131
tests_require=['absl-py', 'google-api-core', 'portpicker'],

‎spanner_orm/__init__.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,3 @@
113113
model_creation_ddl = update_module.model_creation_ddl
114114

115115
MigrationExecutor = migration_executor.MigrationExecutor
116-
117-
try:
118-
__import__('pkg_resources').declare_namespace('spanner_orm')
119-
except ImportError:
120-
__path__ = __import__('pkgutil').extend_path(__path__, 'spanner_orm')

‎spanner_orm/testlib/spanner_emulator/emulator.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
import os
1717
import subprocess
18+
import time
1819
from typing import Mapping, Optional
1920

2021
import portpicker
@@ -65,6 +66,7 @@ def __init__(self,
6566
self._host_port = None
6667

6768
self._start()
69+
time.sleep(1)
6870
self._wait_for_ready()
6971

7072
def get_client(

‎spanner_orm/tests/migrations_emulator_test.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def test_drop_interleaved_table(self):
124124
class _Parent(spanner_orm.Model):
125125
__table__ = 'Parent'
126126
parent_key = spanner_orm.Field(
127-
spanner_orm.String, primary_key=True)
127+
spanner_orm.String(), primary_key=True)
128128
129129
def upgrade():
130130
return spanner_orm.CreateTable(_Parent)
@@ -133,15 +133,15 @@ def upgrade():
133133
class _Parent(spanner_orm.Model):
134134
__table__ = 'Parent'
135135
parent_key = spanner_orm.Field(
136-
spanner_orm.String, primary_key=True)
136+
spanner_orm.String(), primary_key=True)
137137
138138
class _Child(spanner_orm.Model):
139139
__table__ = 'Child'
140140
__interleaved__ = _Parent
141141
parent_key = spanner_orm.Field(
142-
spanner_orm.String, primary_key=True)
142+
spanner_orm.String(), primary_key=True)
143143
child_key = spanner_orm.Field(
144-
spanner_orm.String, primary_key=True)
144+
spanner_orm.String(), primary_key=True)
145145
146146
def upgrade():
147147
return spanner_orm.CreateTable(_Child)
@@ -170,8 +170,8 @@ def upgrade():
170170
class _TableToDrop(spanner_orm.Model):
171171
__table__ = 'TableToDrop'
172172
key = spanner_orm.Field(
173-
spanner_orm.String, primary_key=True)
174-
value = spanner_orm.Field(spanner_orm.String)
173+
spanner_orm.String(), primary_key=True)
174+
value = spanner_orm.Field(spanner_orm.String())
175175
176176
def upgrade():
177177
return spanner_orm.CreateTable(_TableToDrop)
@@ -194,7 +194,7 @@ def upgrade():
194194
class _TableToDrop(spanner_orm.Model):
195195
__table__ = 'TableToDrop'
196196
parent_key = spanner_orm.Field(
197-
spanner_orm.String, primary_key=True)
197+
spanner_orm.String(), primary_key=True)
198198
199199
def upgrade():
200200
return spanner_orm.CreateTable(_TableToDrop)
@@ -203,15 +203,15 @@ def upgrade():
203203
class _TableToDrop(spanner_orm.Model):
204204
__table__ = 'TableToDrop'
205205
parent_key = spanner_orm.Field(
206-
spanner_orm.String, primary_key=True)
206+
spanner_orm.String(), primary_key=True)
207207
208208
class _Child(spanner_orm.Model):
209209
__table__ = 'Child'
210210
__interleaved__ = _TableToDrop
211211
parent_key = spanner_orm.Field(
212-
spanner_orm.String, primary_key=True)
212+
spanner_orm.String(), primary_key=True)
213213
child_key = spanner_orm.Field(
214-
spanner_orm.String, primary_key=True)
214+
spanner_orm.String(), primary_key=True)
215215
216216
def upgrade():
217217
return spanner_orm.CreateTable(_Child)

‎spanner_orm/tests/migrations_for_emulator_test/create_custom_length_field_f959b767457d.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class OriginalTeeTable(spanner_orm.model.Model):
1616
"""
1717

1818
__table__ = 'Tee'
19-
id = spanner_orm.Field(spanner_orm.String, primary_key=True)
19+
id = spanner_orm.Field(spanner_orm.String(), primary_key=True)
2020
custom_string_length = spanner_orm.Field(spanner_orm.String(20))
2121
custom_array_string_length = spanner_orm.Field(
2222
spanner_orm.Array(spanner_orm.String(4)))

‎spanner_orm/tests/migrations_for_emulator_test/create_foreign_key_test_model.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ class OriginalForeignKeyTestModelTable(spanner_orm.model.Model):
2929
"""ORM Model with the original schema for the ForeignKeyTestModel table."""
3030

3131
__table__ = 'ForeignKeyTestModel'
32-
referencing_key_1 = field.Field(field.String, primary_key=True)
33-
referencing_key_2 = field.Field(field.String, primary_key=True)
34-
referencing_key_3 = field.Field(field.Integer, primary_key=True)
35-
self_referencing_key = field.Field(field.String, nullable=True)
32+
referencing_key_1 = field.Field(field.String(), primary_key=True)
33+
referencing_key_2 = field.Field(field.String(), primary_key=True)
34+
referencing_key_3 = field.Field(field.Integer(), primary_key=True)
35+
self_referencing_key = field.Field(field.String(), nullable=True)
3636
foreign_key_1 = foreign_key_relationship.ForeignKeyRelationship(
3737
'SmallTestModel', {'referencing_key_1': 'key'})
3838
foreign_key_2 = foreign_key_relationship.ForeignKeyRelationship(

‎spanner_orm/tests/migrations_for_emulator_test/create_null_filtered_index_model_760ec5fae5da.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525

2626
class _NullFilteredIndexModel(spanner_orm.Model):
2727
__table__ = 'NullFilteredIndexModel'
28-
key = spanner_orm.Field(spanner_orm.String, primary_key=True)
29-
value_1 = spanner_orm.Field(spanner_orm.String, nullable=True)
30-
value_2 = spanner_orm.Field(spanner_orm.Integer)
28+
key = spanner_orm.Field(spanner_orm.String(), primary_key=True)
29+
value_1 = spanner_orm.Field(spanner_orm.String(), nullable=True)
30+
value_2 = spanner_orm.Field(spanner_orm.Integer())
3131

3232

3333
def upgrade() -> spanner_orm.MigrationUpdate:

‎spanner_orm/tests/migrations_for_emulator_test/create_small_test_model.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ class OriginalSmallTestModelTable(spanner_orm.model.Model):
2828
"""ORM Model with the original schema for the SmallTestModel table."""
2929

3030
__table__ = 'SmallTestModel'
31-
key = field.Field(field.String, primary_key=True)
32-
value_1 = field.Field(field.String)
33-
value_2 = field.Field(field.String, nullable=True)
31+
key = field.Field(field.String(), primary_key=True)
32+
value_1 = field.Field(field.String())
33+
value_2 = field.Field(field.String(), nullable=True)
3434

3535

3636
def upgrade() -> spanner_orm.CreateTable:

‎spanner_orm/tests/migrations_for_emulator_test/create_unittest_model.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ class OriginalUnittestModelTable(spanner_orm.model.Model):
2828
"""ORM Model with the original schema for the UnittestModel table."""
2929

3030
__table__ = 'table'
31-
int_ = field.Field(field.Integer, primary_key=True)
32-
int_2 = field.Field(field.Integer, nullable=True)
33-
float_ = field.Field(field.Float, primary_key=True)
34-
float_2 = field.Field(field.Float, nullable=True)
35-
string = field.Field(field.String, primary_key=True)
36-
string_2 = field.Field(field.String, nullable=True)
31+
int_ = field.Field(field.Integer(), primary_key=True)
32+
int_2 = field.Field(field.Integer(), nullable=True)
33+
float_ = field.Field(field.Float(), primary_key=True)
34+
float_2 = field.Field(field.Float(), nullable=True)
35+
string = field.Field(field.String(), primary_key=True)
36+
string_2 = field.Field(field.String(), nullable=True)
3737
string_3 = field.Field(field.String(20), nullable=True)
3838
bytes_ = field.Field(field.BytesBase64, primary_key=True)
3939
bytes_2 = field.Field(field.BytesBase64, nullable=True)
4040
bytes_3 = field.Field(field.BytesBase64(20), nullable=True)
4141
timestamp = field.Field(field.Timestamp)
42-
string_array = field.Field(field.StringArray, nullable=True)
42+
string_array = field.Field(field.Array(field.String()), nullable=True)
4343
string_array_2 = field.Field(field.Array(field.String(20)), nullable=True)
4444

4545

0 commit comments

Comments
 (0)