Skip to content
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

Improve the ORM #88

Merged
merged 13 commits into from
Oct 15, 2019
Merged

Improve the ORM #88

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift click to select a range
416806a
micro-optimize the Model class
Changaco Oct 14, 2019
3e5520f
avoid intermediate dict in `DelegatingCaster.make`
Changaco Oct 14, 2019
442ba00
improve error handling in `DelegatingCaster.make`
Changaco Oct 14, 2019
c0fb88c
avoid creating unnecessary namedtuple classes
Changaco Oct 14, 2019
466533b
optimize the Model objects
Changaco Oct 14, 2019
dcf415c
drop unnecessary checks in `Model.__init__()`
Changaco Oct 14, 2019
11a23af
update method name in `ReadOnly` exception message
Changaco Oct 14, 2019
0f87161
allow `Model` subclasses to use `__slots__`
Changaco Oct 14, 2019
c351c53
remove unnecessary SQL typecasts
Changaco Oct 14, 2019
7cc4306
improve the ORM module docstring
Changaco Oct 14, 2019
6da9d28
test that `Model` subclasses with slots work
Changaco Oct 14, 2019
0c0ca59
increase the test coverage of the ORM
Changaco Oct 14, 2019
914fcef
ignore noncoverage of doctest setups by unit tests
Changaco Oct 14, 2019
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
Prev Previous commit
Next Next commit
increase the test coverage of the ORM
  • Loading branch information
@Changaco
Changaco committed Oct 15, 2019
commit 0c0ca597339625926ac8572822ae2d745b81d132
28 changes: 25 additions & 3 deletions tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 4,15 @@
import sys
from unittest import TestCase

from postgres import Postgres, NotAModel, NotRegistered, NoSuchType, NoTypeSpecified
from postgres import (
AlreadyRegistered, NotAModel, NotRegistered, NoSuchType, NoTypeSpecified,
Postgres,
)
from postgres.cursors import (
BadBackAs, TooFew, TooMany,
Row, SimpleDictCursor, SimpleNamedTupleCursor, SimpleRowCursor, SimpleTupleCursor,
)
from postgres.orm import ReadOnly, Model
from postgres.orm import Model, ReadOnly, UnknownAttributes
from psycopg2.errors import InterfaceError, ProgrammingError, ReadOnlySqlTransaction
from pytest import mark, raises

Expand Down Expand Up @@ -392,6 395,14 @@ def test_register_model_handles_schema(self):
self.db.run("CREATE TABLE foo.flah (bar text)")
self.db.register_model(self.MyModel, 'foo.flah')

def test_register_model_raises_AlreadyRegistered(self):
with self.assertRaises(AlreadyRegistered) as context:
self.db.register_model(self.MyModel)
assert context.exception.args == (self.MyModel, self.MyModel.typname)
assert str(context.exception) == (
"The model MyModel is already registered for the typname foo."
)

def test_register_model_raises_NoSuchType(self):
with self.assertRaises(NoSuchType):
self.db.register_model(self.MyModel, 'nonexistent')
Expand All @@ -414,10 425,21 @@ def test_updating_attributes_works(self):
bar = self.db.one("SELECT bar FROM foo WHERE bar='blah'")
assert bar == one.bar

def test_setting_unknown_attributes(self):
one = self.db.one("SELECT foo FROM foo WHERE bar='baz'")
with self.assertRaises(UnknownAttributes) as context:
one.set_attributes(bar='blah', x=0, y=1)
assert sorted(context.exception.args[0]) == ['x', 'y']
assert str(context.exception) == (
"The following attribute(s) are unknown to us: %s."
) % ', '.join(context.exception.args[0])

def test_attributes_are_read_only(self):
one = self.db.one("SELECT foo FROM foo WHERE bar='baz'")
with self.assertRaises(ReadOnly):
with self.assertRaises(ReadOnly) as context:
one.bar = "blah"
assert context.exception.args == ("bar",)
assert str(context.exception).startswith("bar is a read-only attribute.")

def test_check_register_raises_if_passed_a_model_instance(self):
obj = self.MyModel(['baz'])
Expand Down