Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion sqlalchemy_history/transaction.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ def compile_big_integer(element, compiler, **kw):


class TransactionBase:
issued_at = sa.Column(sa.DateTime, default=lambda: datetime.datetime.now(datetime.timezone.utc))
issued_at = sa.Column(
sa.DateTime, default=lambda: datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None)
)

@property
def entity_names(self):
Expand Down
2 changes: 1 addition & 1 deletion tests/relationships/test_many_to_many_relations.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class Article(self.Model):
sa.DateTime,
nullable=False,
server_default=sa.func.current_timestamp(),
default=lambda: datetime.datetime.now(datetime.timezone.utc),
default=lambda: datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None),
),
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def create_models(self):
sa.DateTime,
nullable=False,
server_default=sa.func.current_timestamp(),
default=lambda: datetime.datetime.now(datetime.timezone.utc),
default=lambda: datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None),
),
)

Expand Down
2 changes: 1 addition & 1 deletion tests/schema/test_update_end_transaction_id.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def create_models(self):
sa.DateTime,
nullable=False,
server_default=sa.func.current_timestamp(),
default=lambda: datetime.datetime.now(datetime.timezone.utc),
default=lambda: datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None),
),
)

Expand Down
4 changes: 3 additions & 1 deletion tests/test_hybrid_property.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ class Article(self.Model):
name = sa.Column(sa.Unicode(255), nullable=False)
content = sa.Column(sa.UnicodeText)
description = sa.Column(sa.UnicodeText)
publish = sa.Column(sa.DateTime, default=lambda: datetime.datetime.now(datetime.timezone.utc))
publish = sa.Column(
sa.DateTime, default=lambda: datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None)
)

author_id = sa.Column(sa.Integer, sa.ForeignKey("article_author.id"), nullable=False)

Expand Down
8 changes: 8 additions & 0 deletions tests/test_transaction.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import datetime
import os
import time

Expand Down Expand Up @@ -51,6 +52,13 @@ def test_transaction_issued_at(self):
self.session.commit()
assert self.article.versions[0].transaction.issued_at != self.article.versions[1].transaction.issued_at

def test_transaction_issued_at_is_naive(self):
uow = versioning_manager.unit_of_work(self.session)
tx = uow.create_transaction(self.session)

assert isinstance(tx.issued_at, datetime.datetime)
assert tx.issued_at.tzinfo is None


# Check that the tests pass without TransactionChangesPlugin
class TestTransactionWithoutChangesPlugin(TestTransaction):
Expand Down
2 changes: 1 addition & 1 deletion tests/utils/test_parent_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def create_models(self):
sa.DateTime,
nullable=False,
server_default=sa.func.current_timestamp(),
default=lambda: datetime.datetime.now(datetime.timezone.utc),
default=lambda: datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None),
),
)

Expand Down
2 changes: 1 addition & 1 deletion tests/utils/test_version_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def create_models(self):
sa.DateTime,
nullable=False,
server_default=sa.func.current_timestamp(),
default=lambda: datetime.datetime.now(datetime.timezone.utc),
default=lambda: datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None),
),
)

Expand Down