From 4a4e5fd1896a221c1a999816017b6a1980508db4 Mon Sep 17 00:00:00 2001 From: Konsta Vesterinen Date: Fri, 2 Jan 2015 18:40:36 +0200 Subject: [PATCH] Remove old expression references --- sqlalchemy_utils/__init__.py | 2 +- sqlalchemy_utils/types/ts_vector.py | 6 +++--- tests/test_expressions.py | 13 +------------ 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/sqlalchemy_utils/__init__.py b/sqlalchemy_utils/__init__.py index 1c5ba7c..0022f95 100644 --- a/sqlalchemy_utils/__init__.py +++ b/sqlalchemy_utils/__init__.py @@ -81,7 +81,7 @@ from .types import ( from .models import Timestamp -__version__ = '0.28.3' +__version__ = '0.29.0' __all__ = ( diff --git a/sqlalchemy_utils/types/ts_vector.py b/sqlalchemy_utils/types/ts_vector.py index 6c4a9b2..011bfc9 100644 --- a/sqlalchemy_utils/types/ts_vector.py +++ b/sqlalchemy_utils/types/ts_vector.py @@ -28,7 +28,7 @@ class TSVectorType(sa.types.TypeDecorator): from sqlalchemy_utils import TSVectorType - class Article(self.Base): + class Article(Base): __tablename__ = 'user' id = sa.Column(sa.Integer, primary_key=True) name = sa.Column(sa.String(100)) @@ -44,7 +44,7 @@ class TSVectorType(sa.types.TypeDecorator): :: - class Article(self.Base): + class Article(Base): __tablename__ = 'user' id = sa.Column(sa.Integer, primary_key=True) name = sa.Column(sa.String(100)) @@ -60,7 +60,7 @@ class TSVectorType(sa.types.TypeDecorator): You can configure TSVectorType to use a specific regconfig. :: - class Article(self.Base): + class Article(Base): __tablename__ = 'user' id = sa.Column(sa.Integer, primary_key=True) name = sa.Column(sa.String(100)) diff --git a/tests/test_expressions.py b/tests/test_expressions.py index 5bf4884..0c0e80f 100644 --- a/tests/test_expressions.py +++ b/tests/test_expressions.py @@ -1,15 +1,6 @@ -from pytest import raises import sqlalchemy as sa from sqlalchemy.dialects import postgresql -from sqlalchemy_utils.types import TSVectorType -from sqlalchemy_utils.expressions import ( - explain, - explain_analyze, - tsvector_match, - tsvector_concat, - to_tsquery, - plainto_tsquery -) +from sqlalchemy_utils.expressions import explain, explain_analyze from tests import TestCase @@ -22,8 +13,6 @@ class ExpressionTestCase(TestCase): id = sa.Column(sa.Integer, primary_key=True) name = sa.Column(sa.Unicode(255)) content = sa.Column(sa.UnicodeText) - search_vector = sa.Column(TSVectorType) - search_vector2 = sa.Column(TSVectorType) self.Article = Article