Skip to content

Ben copy spanner orm upgrade #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bpg130 wants to merge 6 commits into from
Closed

Ben copy spanner orm upgrade #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c3438d6
Update the google-cloud-spanner dependencies to 3.x
jagankumarm Jul 31, 2025
ce77e08
Fix the deprecation warnings
jagankumarm Jul 31, 2025
4a1e84e
spnner version upgrade
jagankumarm Aug 5, 2025
1819bf0
empty commit
jagankumarm Aug 6, 2025
7b5810a
Update api.py
jagankumarm Aug 6, 2025
cd9b4d7
Resolve test race condition
jagankumarm Aug 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
pip install \
absl-py \
google-api-core \
'google-cloud-spanner >= 2, <4' \
'google-cloud-spanner >= 3, <4' \
immutabledict \
portpicker \
pytest
Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

setup(
name='spanner-orm',
version='0.2.0',
version='0.3.0',
description='Basic ORM for Spanner',
maintainer='Python Spanner ORM developers',
maintainer_email='[email protected]',
Expand All @@ -25,7 +25,7 @@
include_package_data=True,
python_requires='~=3.8',
install_requires=[
'google-cloud-spanner >= 2, <4',
'google-cloud-spanner >= 3, <4',
'immutabledict',
],
tests_require=['absl-py', 'google-api-core', 'portpicker'],
Expand Down
5 changes: 0 additions & 5 deletions spanner_orm/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,3 @@
model_creation_ddl = update_module.model_creation_ddl

MigrationExecutor = migration_executor.MigrationExecutor

try:
__import__('pkg_resources').declare_namespace('spanner_orm')
except ImportError:
__path__ = __import__('pkgutil').extend_path(__path__, 'spanner_orm')
2 changes: 2 additions & 0 deletions spanner_orm/testlib/spanner_emulator/emulator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

import os
import subprocess
import time
from typing import Mapping, Optional

import portpicker
Expand Down Expand Up @@ -65,6 +66,7 @@ def __init__(self,
self._host_port = None

self._start()
time.sleep(1)
self._wait_for_ready()

def get_client(
Expand Down
20 changes: 10 additions & 10 deletions spanner_orm/tests/migrations_emulator_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def test_drop_interleaved_table(self):
class _Parent(spanner_orm.Model):
__table__ = 'Parent'
parent_key = spanner_orm.Field(
spanner_orm.String, primary_key=True)
spanner_orm.String(), primary_key=True)

def upgrade():
return spanner_orm.CreateTable(_Parent)
Expand All @@ -133,15 +133,15 @@ def upgrade():
class _Parent(spanner_orm.Model):
__table__ = 'Parent'
parent_key = spanner_orm.Field(
spanner_orm.String, primary_key=True)
spanner_orm.String(), primary_key=True)

class _Child(spanner_orm.Model):
__table__ = 'Child'
__interleaved__ = _Parent
parent_key = spanner_orm.Field(
spanner_orm.String, primary_key=True)
spanner_orm.String(), primary_key=True)
child_key = spanner_orm.Field(
spanner_orm.String, primary_key=True)
spanner_orm.String(), primary_key=True)

def upgrade():
return spanner_orm.CreateTable(_Child)
Expand Down Expand Up @@ -170,8 +170,8 @@ def upgrade():
class _TableToDrop(spanner_orm.Model):
__table__ = 'TableToDrop'
key = spanner_orm.Field(
spanner_orm.String, primary_key=True)
value = spanner_orm.Field(spanner_orm.String)
spanner_orm.String(), primary_key=True)
value = spanner_orm.Field(spanner_orm.String())

def upgrade():
return spanner_orm.CreateTable(_TableToDrop)
Expand All @@ -194,7 +194,7 @@ def upgrade():
class _TableToDrop(spanner_orm.Model):
__table__ = 'TableToDrop'
parent_key = spanner_orm.Field(
spanner_orm.String, primary_key=True)
spanner_orm.String(), primary_key=True)

def upgrade():
return spanner_orm.CreateTable(_TableToDrop)
Expand All @@ -203,15 +203,15 @@ def upgrade():
class _TableToDrop(spanner_orm.Model):
__table__ = 'TableToDrop'
parent_key = spanner_orm.Field(
spanner_orm.String, primary_key=True)
spanner_orm.String(), primary_key=True)

class _Child(spanner_orm.Model):
__table__ = 'Child'
__interleaved__ = _TableToDrop
parent_key = spanner_orm.Field(
spanner_orm.String, primary_key=True)
spanner_orm.String(), primary_key=True)
child_key = spanner_orm.Field(
spanner_orm.String, primary_key=True)
spanner_orm.String(), primary_key=True)

def upgrade():
return spanner_orm.CreateTable(_Child)
Expand Down
2 changes: 1 addition & 1 deletion spanner_orm/tests/migrations_for_emulator_test/create_custom_length_field_f959b767457d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class OriginalTeeTable(spanner_orm.model.Model):
"""

__table__ = 'Tee'
id = spanner_orm.Field(spanner_orm.String, primary_key=True)
id = spanner_orm.Field(spanner_orm.String(), primary_key=True)
custom_string_length = spanner_orm.Field(spanner_orm.String(20))
custom_array_string_length = spanner_orm.Field(
spanner_orm.Array(spanner_orm.String(4)))
Expand Down
8 changes: 4 additions & 4 deletions spanner_orm/tests/migrations_for_emulator_test/create_foreign_key_test_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ class OriginalForeignKeyTestModelTable(spanner_orm.model.Model):
"""ORM Model with the original schema for the ForeignKeyTestModel table."""

__table__ = 'ForeignKeyTestModel'
referencing_key_1 = field.Field(field.String, primary_key=True)
referencing_key_2 = field.Field(field.String, primary_key=True)
referencing_key_3 = field.Field(field.Integer, primary_key=True)
self_referencing_key = field.Field(field.String, nullable=True)
referencing_key_1 = field.Field(field.String(), primary_key=True)
referencing_key_2 = field.Field(field.String(), primary_key=True)
referencing_key_3 = field.Field(field.Integer(), primary_key=True)
self_referencing_key = field.Field(field.String(), nullable=True)
foreign_key_1 = foreign_key_relationship.ForeignKeyRelationship(
'SmallTestModel', {'referencing_key_1': 'key'})
foreign_key_2 = foreign_key_relationship.ForeignKeyRelationship(
Expand Down
6 changes: 3 additions & 3 deletions ...r_orm/tests/migrations_for_emulator_test/create_null_filtered_index_model_760ec5fae5da.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@

class _NullFilteredIndexModel(spanner_orm.Model):
__table__ = 'NullFilteredIndexModel'
key = spanner_orm.Field(spanner_orm.String, primary_key=True)
value_1 = spanner_orm.Field(spanner_orm.String, nullable=True)
value_2 = spanner_orm.Field(spanner_orm.Integer)
key = spanner_orm.Field(spanner_orm.String(), primary_key=True)
value_1 = spanner_orm.Field(spanner_orm.String(), nullable=True)
value_2 = spanner_orm.Field(spanner_orm.Integer())


def upgrade() -> spanner_orm.MigrationUpdate:
Expand Down
6 changes: 3 additions & 3 deletions spanner_orm/tests/migrations_for_emulator_test/create_small_test_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ class OriginalSmallTestModelTable(spanner_orm.model.Model):
"""ORM Model with the original schema for the SmallTestModel table."""

__table__ = 'SmallTestModel'
key = field.Field(field.String, primary_key=True)
value_1 = field.Field(field.String)
value_2 = field.Field(field.String, nullable=True)
key = field.Field(field.String(), primary_key=True)
value_1 = field.Field(field.String())
value_2 = field.Field(field.String(), nullable=True)


def upgrade() -> spanner_orm.CreateTable:
Expand Down
14 changes: 7 additions & 7 deletions spanner_orm/tests/migrations_for_emulator_test/create_unittest_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@ class OriginalUnittestModelTable(spanner_orm.model.Model):
"""ORM Model with the original schema for the UnittestModel table."""

__table__ = 'table'
int_ = field.Field(field.Integer, primary_key=True)
int_2 = field.Field(field.Integer, nullable=True)
float_ = field.Field(field.Float, primary_key=True)
float_2 = field.Field(field.Float, nullable=True)
string = field.Field(field.String, primary_key=True)
string_2 = field.Field(field.String, nullable=True)
int_ = field.Field(field.Integer(), primary_key=True)
int_2 = field.Field(field.Integer(), nullable=True)
float_ = field.Field(field.Float(), primary_key=True)
float_2 = field.Field(field.Float(), nullable=True)
string = field.Field(field.String(), primary_key=True)
string_2 = field.Field(field.String(), nullable=True)
string_3 = field.Field(field.String(20), nullable=True)
bytes_ = field.Field(field.BytesBase64, primary_key=True)
bytes_2 = field.Field(field.BytesBase64, nullable=True)
bytes_3 = field.Field(field.BytesBase64(20), nullable=True)
timestamp = field.Field(field.Timestamp)
string_array = field.Field(field.StringArray, nullable=True)
string_array = field.Field(field.Array(field.String()), nullable=True)
string_array_2 = field.Field(field.Array(field.String(20)), nullable=True)


Expand Down