diff --git a/fix_test_reflection.patch b/fix_test_reflection.patch new file mode 100644 index 0000000..a6194d0 --- /dev/null +++ b/fix_test_reflection.patch @@ -0,0 +1,47 @@ +From 871c64221a56e546237e7cf1b2910842027c3531 Mon Sep 17 00:00:00 2001 +From: Nils Philippsen +Date: Sun, 24 Jun 2018 11:47:05 -0400 +Subject: [PATCH] fix TypeReflectionTest for sqlite 3.24 + +Fixed issue in test suite where SQLite 3.24 added a new reserved word that +conflicted with a usage in TypeReflectionTest. Pull request courtesy Nils +Philippsen. + +Change-Id: I396562cecb5ca774f29e9234845bcc6a399fc5cb +Pull-request: https://github.com/zzzeek/sqlalchemy/pull/452 +(cherry picked from commit 40a5d0a4b006780167976b296984eb9790f3df7f) +--- + doc/build/changelog/unreleased_12/pr452.rst | 7 +++++++ + test/dialect/test_sqlite.py | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) + create mode 100644 doc/build/changelog/unreleased_12/pr452.rst + +diff --git a/doc/build/changelog/unreleased_12/pr452.rst b/doc/build/changelog/unreleased_12/pr452.rst +new file mode 100644 +index 0000000..471b203 +--- /dev/null ++++ b/doc/build/changelog/unreleased_12/pr452.rst +@@ -0,0 +1,7 @@ ++.. change:: ++ :tags: bug, sqlite ++ :versions: 1.3.0b1 ++ ++ Fixed issue in test suite where SQLite 3.24 added a new reserved word that ++ conflicted with a usage in TypeReflectionTest. Pull request courtesy Nils ++ Philippsen. +diff --git a/test/dialect/test_sqlite.py b/test/dialect/test_sqlite.py +index 4c462ae..d2d5632 100644 +--- a/test/dialect/test_sqlite.py ++++ b/test/dialect/test_sqlite.py +@@ -1637,7 +1637,7 @@ class TypeReflectionTest(fixtures.TestBase): + ("BLOBBER", sqltypes.NullType()), + ("DOUBLE PRECISION", sqltypes.REAL()), + ("FLOATY", sqltypes.REAL()), +- ("NOTHING WE KNOW", sqltypes.NUMERIC()), ++ ("SOMETHING UNKNOWN", sqltypes.NUMERIC()), + ] + + def _fixture_as_string(self, fixture): +-- +2.10.5 + diff --git a/python-SQLAlchemy.changes b/python-SQLAlchemy.changes index 90dbfd6..7f7c130 100644 --- a/python-SQLAlchemy.changes +++ b/python-SQLAlchemy.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 26 06:55:57 UTC 2018 - mimi.vx@gmail.com + +- add upstream fix_test_reflection.patch to fix tests with new sqlite + ------------------------------------------------------------------- Thu Jun 21 23:01:18 UTC 2018 - hpj@urpla.net diff --git a/python-SQLAlchemy.spec b/python-SQLAlchemy.spec index 47c0c83..6bb716a 100644 --- a/python-SQLAlchemy.spec +++ b/python-SQLAlchemy.spec @@ -27,6 +27,7 @@ License: MIT Group: Development/Languages/Python URL: http://www.sqlalchemy.org Source: https://files.pythonhosted.org/packages/source/S/SQLAlchemy/SQLAlchemy-%{version}.tar.gz +Patch0: fix_test_reflection.patch BuildRequires: %{python_module devel} # Test requirements: BuildRequires: %{python_module mock} @@ -69,6 +70,7 @@ reference for python-SQLAlchemy. %prep %setup -q -n SQLAlchemy-%{version} +%patch0 -p1 rm -rf doc/build # Remove unnecessary scripts for building documentation sed -i 's/\r$//' examples/dynamic_dict/dynamic_dict.py