From ee76d3dcc4f88c7aaca48cfcc3f98ebde4b338f5 Mon Sep 17 00:00:00 2001 From: Janne Vanhala Date: Mon, 19 Feb 2024 17:49:06 +0200 Subject: [PATCH] test: use String/Text over Unicode/UnicodeText --- tests/conftest.py | 8 ++++---- tests/test_multiple_vectors_per_class.py | 8 ++++---- tests/test_schema_creation.py | 4 ++-- tests/test_single_table_inheritance.py | 4 ++-- tests/test_vectorizers.py | 2 +- tests/test_weighted_search_vector.py | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 2e1fa0a..8b32195 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -7,9 +7,9 @@ DateTime, ForeignKey, Integer, + String, + Text, text, - Unicode, - UnicodeText, ) from sqlalchemy.orm import ( close_all_sessions, @@ -175,12 +175,12 @@ class TextItem(Base): id = Column(Integer, primary_key=True, autoincrement=True) - name = Column(Unicode(255)) + name = Column(String(255)) search_vector = Column(TSVectorType("name", "content", **ts_vector_options)) content_search_vector = Column(TSVectorType("content", **ts_vector_options)) - content = Column(UnicodeText) + content = Column(Text) return TextItem diff --git a/tests/test_multiple_vectors_per_class.py b/tests/test_multiple_vectors_per_class.py index 2114b9f..a7290c2 100644 --- a/tests/test_multiple_vectors_per_class.py +++ b/tests/test_multiple_vectors_per_class.py @@ -28,9 +28,9 @@ class TextItem(Base): id = sa.Column(sa.Integer, primary_key=True, autoincrement=True) - name = sa.Column(sa.Unicode(255)) + name = sa.Column(sa.String(255)) - content = sa.Column(sa.UnicodeText) + content = sa.Column(sa.Text) name_vector = sa.Column(TSVectorType("name", auto_index=True)) @@ -45,8 +45,8 @@ class TextMultiItem(Base): id = sa.Column(sa.Integer, primary_key=True, autoincrement=True) - name = sa.Column(sa.Unicode(255)) - content = sa.Column(sa.UnicodeText) + name = sa.Column(sa.String(255)) + content = sa.Column(sa.Text) name_vector = sa.Column(TSVectorType("name", auto_index=False)) content_vector = sa.Column(TSVectorType("content", auto_index=False)) diff --git a/tests/test_schema_creation.py b/tests/test_schema_creation.py index 18eb3ac..4fc4d8f 100644 --- a/tests/test_schema_creation.py +++ b/tests/test_schema_creation.py @@ -37,8 +37,8 @@ class TextItem(Base): id = sa.Column(sa.Integer, primary_key=True, autoincrement=True) - name = sa.Column(sa.Unicode(255)) + name = sa.Column(sa.String(255)) search_vector = sa.Column(TSVectorType(auto_index=True)) - content = sa.Column(sa.UnicodeText) + content = sa.Column(sa.Text) diff --git a/tests/test_single_table_inheritance.py b/tests/test_single_table_inheritance.py index d828212..21a52f3 100644 --- a/tests/test_single_table_inheritance.py +++ b/tests/test_single_table_inheritance.py @@ -21,11 +21,11 @@ class TextItem(Base): id = sa.Column(sa.Integer, primary_key=True, autoincrement=True) - name = sa.Column(sa.Unicode(255)) + name = sa.Column(sa.String(255)) search_vector = sa.Column(TSVectorType("name", "content")) - content = sa.Column(sa.UnicodeText) + content = sa.Column(sa.Text) class Article(TextItem): created_at = sa.Column(sa.DateTime) diff --git a/tests/test_vectorizers.py b/tests/test_vectorizers.py index 76c3d1b..a43bd21 100644 --- a/tests/test_vectorizers.py +++ b/tests/test_vectorizers.py @@ -24,7 +24,7 @@ class Article(Base): TSVectorType("name", "content", regconfig="simple") ) - content = sa.Column(sa.UnicodeText) + content = sa.Column(sa.Text) @vectorizer(HSTORE) def hstore_vectorizer(column): diff --git a/tests/test_weighted_search_vector.py b/tests/test_weighted_search_vector.py index e7de6e7..3d561d0 100644 --- a/tests/test_weighted_search_vector.py +++ b/tests/test_weighted_search_vector.py @@ -21,8 +21,8 @@ class WeightedTextItem(Base): id = sa.Column(sa.Integer, primary_key=True, autoincrement=True) - name = sa.Column(sa.Unicode(255)) - content = sa.Column(sa.UnicodeText) + name = sa.Column(sa.String(255)) + content = sa.Column(sa.Text) search_vector = sa.Column( TSVectorType("name", "content", weights={"name": "A", "content": "B"}) )