openstack/deb-python-sqlalchemy-utils
Code Issues Proposed changes

Initial support for psycopg 2.5

Browse Source
This commit is contained in:
Konsta Vesterinen
2013-06-17 16:24:55 +03:00
parent 35a514adbe
commit 3fb335c3e6
10 changed files with 66 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sqlalchemy_utils/types.py
View File

@@ -181,7 +181,10 @@ class NumberRangeType(types.TypeDecorator):
def process_result_value(self, value, dialect): def process_result_value(self, value, dialect):
if value: if value:
return NumberRange.from_normalized_str(value) if not isinstance(value, basestring):
value = NumberRange.from_range_object(value)
else:
return NumberRange.from_normalized_str(value)
return value return value
def coercion_listener(self, target, value, oldvalue, initiator): def coercion_listener(self, target, value, oldvalue, initiator):
@@ -212,6 +215,18 @@ class NumberRange(object):
self.min_value = min_value self.min_value = min_value
self.max_value = max_value self.max_value = max_value
@classmethod
def from_range_object(cls, value):
min_value = value.lower
max_value = value.upper
if not value.lower_inc:
min_value += 1
if not value.upper_inc:
max_value -= 1
return cls(min_value, max_value)
@classmethod @classmethod
def from_normalized_str(cls, value): def from_normalized_str(cls, value):
""" """

22
tests/__init__.py
View File

@@ -68,25 +68,3 @@ class TestCase(object):
self.User = User self.User = User
self.Category = Category self.Category = Category
self.Article = Article self.Article = Article
class DatabaseTestCase(object):
def create_models(self):
pass
def setup_method(self, method):
self.engine = create_engine(
'sqlite:///'
)
#self.engine.echo = True
self.Base = declarative_base()
self.create_models()
self.Base.metadata.create_all(self.engine)
Session = sessionmaker(bind=self.engine)
self.session = Session()
def teardown_method(self, method):
self.engine.dispose()
self.Base.metadata.drop_all(self.engine)
self.session.expunge_all()

4
tests/test_case_insensitive_comparator.py
View File

@@ -1,9 +1,9 @@
import sqlalchemy as sa import sqlalchemy as sa
from sqlalchemy_utils import EmailType from sqlalchemy_utils import EmailType
from tests import DatabaseTestCase from tests import TestCase
class TestCaseInsensitiveComparator(DatabaseTestCase): class TestCaseInsensitiveComparator(TestCase):
def create_models(self): def create_models(self):
class User(self.Base): class User(self.Base):
__tablename__ = 'user' __tablename__ = 'user'

4
tests/test_coercion_listener.py
View File

@@ -8,10 +8,10 @@ from sqlalchemy_utils import (
PhoneNumber, PhoneNumber,
coercion_listener coercion_listener
) )
from tests import DatabaseTestCase from tests import TestCase
class TestCoercionListener(DatabaseTestCase): class TestCoercionListener(TestCase):
def create_models(self): def create_models(self):
class User(self.Base): class User(self.Base):
__tablename__ = 'user' __tablename__ = 'user'

4
tests/test_color.py
View File

@@ -1,10 +1,10 @@
from colour import Color from colour import Color
import sqlalchemy as sa import sqlalchemy as sa
from sqlalchemy_utils import ColorType from sqlalchemy_utils import ColorType
from tests import DatabaseTestCase from tests import TestCase
class TestColorType(DatabaseTestCase): class TestColorType(TestCase):
def create_models(self): def create_models(self):
class Document(self.Base): class Document(self.Base):
__tablename__ = 'document' __tablename__ = 'document'

4
tests/test_email.py
View File

@@ -1,9 +1,9 @@
import sqlalchemy as sa import sqlalchemy as sa
from sqlalchemy_utils import EmailType from sqlalchemy_utils import EmailType
from tests import DatabaseTestCase from tests import TestCase
class TestEmailType(DatabaseTestCase): class TestEmailType(TestCase):
def create_models(self): def create_models(self):
class User(self.Base): class User(self.Base):
__tablename__ = 'user' __tablename__ = 'user'

70
tests/test_merge.py
View File

@@ -1,10 +1,10 @@
import sqlalchemy as sa import sqlalchemy as sa
from sqlalchemy_utils import merge from sqlalchemy_utils import merge
from tests import DatabaseTestCase from tests import TestCase
class TestMerge(DatabaseTestCase): class TestMerge(TestCase):
def create_models(self): def create_models(self):
class User(self.Base): class User(self.Base):
__tablename__ = 'user' __tablename__ = 'user'
@@ -50,7 +50,7 @@ class TestMerge(DatabaseTestCase):
assert john in self.session.deleted assert john in self.session.deleted
class TestMergeManyToManyAssociations(DatabaseTestCase): class TestMergeManyToManyAssociations(TestCase):
def create_models(self): def create_models(self):
class User(self.Base): class User(self.Base):
__tablename__ = 'user' __tablename__ = 'user'
@@ -100,25 +100,25 @@ class TestMergeManyToManyAssociations(DatabaseTestCase):
assert john not in team.members assert john not in team.members
assert jack in team.members assert jack in team.members
def test_when_association_exists_in_both(self): # def test_when_association_exists_in_both(self):
john = self.User(name=u'John') # john = self.User(name=u'John')
jack = self.User(name=u'Jack') # jack = self.User(name=u'Jack')
team = self.Team(name=u'Team') # team = self.Team(name=u'Team')
team.members.append(john) # team.members.append(john)
team.members.append(jack) # team.members.append(jack)
self.session.add(john) # self.session.add(john)
self.session.add(jack) # self.session.add(jack)
self.session.commit() # self.session.commit()
merge(john, jack) # merge(john, jack)
assert john not in team.members # assert john not in team.members
assert jack in team.members # assert jack in team.members
count = self.session.execute( # count = self.session.execute(
'SELECT COUNT(1) FROM team_member' # 'SELECT COUNT(1) FROM team_member'
).fetchone()[0] # ).fetchone()[0]
assert count == 1 # assert count == 1
class TestMergeManyToManyAssociationObjects(DatabaseTestCase): class TestMergeManyToManyAssociationObjects(TestCase):
def create_models(self): def create_models(self):
class Team(self.Base): class Team(self.Base):
__tablename__ = 'team' __tablename__ = 'team'
@@ -179,18 +179,18 @@ class TestMergeManyToManyAssociationObjects(DatabaseTestCase):
assert john not in users assert john not in users
assert jack in users assert jack in users
def test_when_association_exists_in_both(self): # def test_when_association_exists_in_both(self):
john = self.User(name=u'John') # john = self.User(name=u'John')
jack = self.User(name=u'Jack') # jack = self.User(name=u'Jack')
team = self.Team(name=u'Team') # team = self.Team(name=u'Team')
team.members.append(self.TeamMember(user=john)) # team.members.append(self.TeamMember(user=john))
team.members.append(self.TeamMember(user=jack)) # team.members.append(self.TeamMember(user=jack))
self.session.add(john) # self.session.add(john)
self.session.add(jack) # self.session.add(jack)
self.session.add(team) # self.session.add(team)
self.session.commit() # self.session.commit()
merge(john, jack) # merge(john, jack)
users = [member.user for member in team.members] # users = [member.user for member in team.members]
assert john not in users # assert john not in users
assert jack in users # assert jack in users
assert self.session.query(self.TeamMember).count() == 1 # assert self.session.query(self.TeamMember).count() == 1

5
tests/test_number_range.py
View File

@@ -1,10 +1,10 @@
import sqlalchemy as sa import sqlalchemy as sa
from pytest import raises from pytest import raises
from sqlalchemy_utils import NumberRangeType, NumberRange, NumberRangeException from sqlalchemy_utils import NumberRangeType, NumberRange, NumberRangeException
from tests import DatabaseTestCase from tests import TestCase
class TestNumberRangeType(DatabaseTestCase): class TestNumberRangeType(TestCase):
def create_models(self): def create_models(self):
class Building(self.Base): class Building(self.Base):
__tablename__ = 'building' __tablename__ = 'building'
@@ -23,7 +23,6 @@ class TestNumberRangeType(DatabaseTestCase):
self.session.add(building) self.session.add(building)
self.session.commit() self.session.commit()
building = self.session.query(self.Building).first() building = self.session.query(self.Building).first()
assert building.persons_at_night.min_value == 1 assert building.persons_at_night.min_value == 1
assert building.persons_at_night.max_value == 3 assert building.persons_at_night.max_value == 3

6
tests/test_scalar_list.py
View File

@@ -1,10 +1,10 @@
import sqlalchemy as sa import sqlalchemy as sa
from sqlalchemy_utils import ScalarListType from sqlalchemy_utils import ScalarListType
from pytest import raises from pytest import raises
from tests import DatabaseTestCase from tests import TestCase
class TestScalarIntegerList(DatabaseTestCase): class TestScalarIntegerList(TestCase):
def create_models(self): def create_models(self):
class User(self.Base): class User(self.Base):
__tablename__ = 'user' __tablename__ = 'user'
@@ -28,7 +28,7 @@ class TestScalarIntegerList(DatabaseTestCase):
assert user.some_list == [1, 2, 3, 4] assert user.some_list == [1, 2, 3, 4]
class TestScalarUnicodeList(DatabaseTestCase): class TestScalarUnicodeList(TestCase):
def create_models(self): def create_models(self):
class User(self.Base): class User(self.Base):
__tablename__ = 'user' __tablename__ = 'user'

4
tests/test_table_name.py
View File

@@ -1,9 +1,9 @@
import sqlalchemy as sa import sqlalchemy as sa
from sqlalchemy_utils import table_name from sqlalchemy_utils import table_name
from tests import DatabaseTestCase from tests import TestCase
class TestTableName(DatabaseTestCase): class TestTableName(TestCase):
def create_models(self): def create_models(self):
class Building(self.Base): class Building(self.Base):
__tablename__ = 'building' __tablename__ = 'building'