Skip to content

Support for Commit timestamps #80

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

Open
maroux wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Support for Commit timestamps #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 14 additions & 3 deletions spanner_orm/field.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,27 @@ class Field(object):
def __init__(self,
field_type: Type[FieldType],
nullable: bool = False,
primary_key: bool = False):
primary_key: bool = False,
allow_commit_timestamp: bool = False):
self.name = None
self._type = field_type
self._nullable = nullable
self._primary_key = primary_key
self._allow_commit_timestamp = allow_commit_timestamp

if self._type.ddl() != "TIMESTAMP" and self._allow_commit_timestamp:
raise error.ValidationError('allow_commit_timestamp can not be set on field {}'.format(self._type))

def ddl(self) -> str:
if self._nullable:
return self._type.ddl()
return '{field_type} NOT NULL'.format(field_type=self._type.ddl())
nullable = ''
else:
nullable = ' NOT NULL'
if self._allow_commit_timestamp:
options = ' OPTIONS (allow_commit_timestamp=true)'
else:
options = ''
return '{field_type}{nullable}{options}'.format(field_type=self._type.ddl(), nullable=nullable, options=options)

def field_type(self) -> Type[FieldType]:
return self._type
Expand Down
1 change: 1 addition & 0 deletions spanner_orm/tests/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ class UnittestModel(model.Model):
string = field.Field(field.String, primary_key=True)
string_2 = field.Field(field.String, nullable=True)
timestamp = field.Field(field.Timestamp)
timestamp_2 = field.Field(field.Timestamp, nullable=True, allow_commit_timestamp=True)
string_array = field.Field(field.StringArray, nullable=True)

test_index = index.Index(['string_2'])
5 changes: 3 additions & 2 deletions spanner_orm/tests/update_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,9 @@ def test_create_table(self, get_model):

test_model_ddl = ('CREATE TABLE table (int_ INT64 NOT NULL, int_2 INT64,'
' string STRING(MAX) NOT NULL, string_2 STRING(MAX),'
' timestamp TIMESTAMP NOT NULL, string_array'
' ARRAY<STRING(MAX)>) PRIMARY KEY (int_, string)')
' timestamp TIMESTAMP NOT NULL,'
' timestamp_2 TIMESTAMP OPTIONS (allow_commit_timestamp=true),'
' string_array ARRAY<STRING(MAX)>) PRIMARY KEY (int_, string)')
self.assertEqual(test_update.ddl(), test_model_ddl)

@mock.patch('spanner_orm.admin.metadata.SpannerMetadata.model')
Expand Down