summaryrefslogtreecommitdiff
path: root/test/sql
diff options
context:
space:
mode:
authorAdrien Berchet <adrien.berchet@gmail.com>2019-04-15 13:59:18 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2019-04-29 17:24:32 -0400
commita10a4ea1248902349d789de7f5470bb8e437a584 (patch)
tree536acae15894ae8f60ac2aedd784e37575ccba39 /test/sql
parent64865304051b2af1ee4f90c6bf5e93378d4f302c (diff)
downloadsqlalchemy-a10a4ea1248902349d789de7f5470bb8e437a584.tar.gz
Add case insensitivity feature to GenericFunction.
The :class:`.GenericFunction` namespace is being migrated so that function names are looked up in a case-insensitive manner, as SQL functions do not collide on case sensitive differences nor is this something which would occur with user-defined functions or stored procedures. Lookups for functions declared with :class:`.GenericFunction` now use a case insensitive scheme, however a deprecation case is supported which allows two or more :class:`.GenericFunction` objects with the same name of different cases to exist, which will cause case sensitive lookups to occur for that particular name, while emitting a warning at function registration time. Thanks to Adrien Berchet for a lot of work on this complicated feature. Fixes: #4569 Closes: #4570 Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/4570 Pull-request-sha: 37d4f3322b6bace88c99b959cb1916dbbc57610e Change-Id: Ief07c6eb55bf398f6aad85b60ef13ee6d1173109
Diffstat (limited to 'test/sql')
-rw-r--r--test/sql/test_deprecations.py151
-rw-r--r--test/sql/test_functions.py58
2 files changed, 206 insertions, 3 deletions
diff --git a/test/sql/test_deprecations.py b/test/sql/test_deprecations.py
index 7990cd56c..08a862e43 100644
--- a/test/sql/test_deprecations.py
+++ b/test/sql/test_deprecations.py
@@ -1,11 +1,17 @@
#! coding: utf-8
+from copy import deepcopy
+
+import pytest
+
from sqlalchemy import bindparam
from sqlalchemy import Column
from sqlalchemy import column
from sqlalchemy import create_engine
+from sqlalchemy import DateTime
from sqlalchemy import exc
from sqlalchemy import ForeignKey
+from sqlalchemy import func
from sqlalchemy import Integer
from sqlalchemy import MetaData
from sqlalchemy import select
@@ -17,14 +23,19 @@ from sqlalchemy import text
from sqlalchemy import util
from sqlalchemy.engine import default
from sqlalchemy.schema import DDL
+from sqlalchemy.sql import functions
from sqlalchemy.sql import util as sql_util
+from sqlalchemy.sql.functions import GenericFunction
+from sqlalchemy.sql.sqltypes import NullType
from sqlalchemy.testing import assert_raises
from sqlalchemy.testing import assert_raises_message
from sqlalchemy.testing import AssertsCompiledSQL
from sqlalchemy.testing import engines
from sqlalchemy.testing import eq_
from sqlalchemy.testing import fixtures
+from sqlalchemy.testing import in_
from sqlalchemy.testing import mock
+from sqlalchemy.testing import not_in_
class DeprecationWarningsTest(fixtures.TestBase):
@@ -136,6 +147,146 @@ class DeprecationWarningsTest(fixtures.TestBase):
)
+class CaseSensitiveFunctionDeprecationsTest(fixtures.TestBase):
+
+ def setup(self):
+ self._registry = deepcopy(functions._registry)
+ self._case_sensitive_registry = deepcopy(
+ functions._case_sensitive_registry)
+ functions._registry.clear()
+ functions._case_sensitive_registry.clear()
+
+ def teardown(self):
+ functions._registry = self._registry
+ functions._case_sensitive_registry = self._case_sensitive_registry
+
+ def test_case_sensitive(self):
+ reg = functions._registry['_default']
+ cs_reg = functions._case_sensitive_registry['_default']
+
+ class MYFUNC(GenericFunction):
+ type = DateTime
+
+ assert isinstance(func.MYFUNC().type, DateTime)
+ assert isinstance(func.MyFunc().type, DateTime)
+ assert isinstance(func.mYfUnC().type, DateTime)
+ assert isinstance(func.myfunc().type, DateTime)
+
+ in_("myfunc", reg)
+ not_in_("MYFUNC", reg)
+ not_in_("MyFunc", reg)
+ in_("myfunc", cs_reg)
+ eq_(set(cs_reg['myfunc'].keys()), set(['MYFUNC']))
+
+ with testing.expect_deprecated(
+ "GenericFunction 'MyFunc' is already registered with"
+ " different letter case, so the previously registered function "
+ "'MYFUNC' is switched into case-sensitive mode. "
+ "GenericFunction objects will be fully case-insensitive in a "
+ "future release.",
+ regex=False
+ ):
+ class MyFunc(GenericFunction):
+ type = Integer
+
+ assert isinstance(func.MYFUNC().type, DateTime)
+ assert isinstance(func.MyFunc().type, Integer)
+ with pytest.raises(AssertionError):
+ assert isinstance(func.mYfUnC().type, Integer)
+ with pytest.raises(AssertionError):
+ assert isinstance(func.myfunc().type, Integer)
+
+ eq_(reg["myfunc"], functions._CASE_SENSITIVE)
+ not_in_("MYFUNC", reg)
+ not_in_("MyFunc", reg)
+ in_("myfunc", cs_reg)
+ eq_(set(cs_reg['myfunc'].keys()), set(['MYFUNC', 'MyFunc']))
+
+ def test_replace_function_case_sensitive(self):
+ reg = functions._registry['_default']
+ cs_reg = functions._case_sensitive_registry['_default']
+
+ class replaceable_func(GenericFunction):
+ type = Integer
+ identifier = 'REPLACEABLE_FUNC'
+
+ assert isinstance(func.REPLACEABLE_FUNC().type, Integer)
+ assert isinstance(func.Replaceable_Func().type, Integer)
+ assert isinstance(func.RePlAcEaBlE_fUnC().type, Integer)
+ assert isinstance(func.replaceable_func().type, Integer)
+
+ in_("replaceable_func", reg)
+ not_in_("REPLACEABLE_FUNC", reg)
+ not_in_("Replaceable_Func", reg)
+ in_("replaceable_func", cs_reg)
+ eq_(set(cs_reg['replaceable_func'].keys()), set(['REPLACEABLE_FUNC']))
+
+ with testing.expect_deprecated(
+ "GenericFunction 'Replaceable_Func' is already registered with"
+ " different letter case, so the previously registered function "
+ "'REPLACEABLE_FUNC' is switched into case-sensitive mode. "
+ "GenericFunction objects will be fully case-insensitive in a "
+ "future release.",
+ regex=False
+ ):
+ class Replaceable_Func(GenericFunction):
+ type = DateTime
+ identifier = 'Replaceable_Func'
+
+ assert isinstance(func.REPLACEABLE_FUNC().type, Integer)
+ assert isinstance(func.Replaceable_Func().type, DateTime)
+ assert isinstance(func.RePlAcEaBlE_fUnC().type, NullType)
+ assert isinstance(func.replaceable_func().type, NullType)
+
+ eq_(reg["replaceable_func"], functions._CASE_SENSITIVE)
+ not_in_("REPLACEABLE_FUNC", reg)
+ not_in_("Replaceable_Func", reg)
+ in_("replaceable_func", cs_reg)
+ eq_(set(cs_reg['replaceable_func'].keys()),
+ set(['REPLACEABLE_FUNC', 'Replaceable_Func']))
+
+ with testing.expect_warnings(
+ "The GenericFunction 'REPLACEABLE_FUNC' is already registered and "
+ "is going to be overriden.",
+ regex=False
+ ):
+ class replaceable_func_override(GenericFunction):
+ type = DateTime
+ identifier = 'REPLACEABLE_FUNC'
+
+ with testing.expect_deprecated(
+ "GenericFunction(s) '['REPLACEABLE_FUNC', 'Replaceable_Func']' "
+ "are already registered with different letter cases and might "
+ "interact with 'replaceable_func'. GenericFunction objects will "
+ "be fully case-insensitive in a future release.",
+ regex=False
+ ):
+ class replaceable_func_lowercase(GenericFunction):
+ type = String
+ identifier = 'replaceable_func'
+
+ with testing.expect_warnings(
+ "The GenericFunction 'Replaceable_Func' is already registered and "
+ "is going to be overriden.",
+ regex=False
+ ):
+ class Replaceable_Func_override(GenericFunction):
+ type = Integer
+ identifier = 'Replaceable_Func'
+
+ assert isinstance(func.REPLACEABLE_FUNC().type, DateTime)
+ assert isinstance(func.Replaceable_Func().type, Integer)
+ assert isinstance(func.RePlAcEaBlE_fUnC().type, NullType)
+ assert isinstance(func.replaceable_func().type, String)
+
+ eq_(reg["replaceable_func"], functions._CASE_SENSITIVE)
+ not_in_("REPLACEABLE_FUNC", reg)
+ not_in_("Replaceable_Func", reg)
+ in_("replaceable_func", cs_reg)
+ eq_(set(cs_reg['replaceable_func'].keys()),
+ set(['REPLACEABLE_FUNC', 'Replaceable_Func', 'replaceable_func']))
+
+
class DDLListenerDeprecationsTest(fixtures.TestBase):
def setup(self):
self.bind = self.engine = engines.mock_engine()
diff --git a/test/sql/test_functions.py b/test/sql/test_functions.py
index 5fb4bc2e4..b03b156bc 100644
--- a/test/sql/test_functions.py
+++ b/test/sql/test_functions.py
@@ -1,3 +1,4 @@
+from copy import deepcopy
import datetime
import decimal
@@ -39,6 +40,7 @@ from sqlalchemy.testing import engines
from sqlalchemy.testing import eq_
from sqlalchemy.testing import fixtures
from sqlalchemy.testing import is_
+from sqlalchemy.testing.assertions import expect_warnings
from sqlalchemy.testing.engines import all_dialects
@@ -53,8 +55,14 @@ table1 = table(
class CompileTest(fixtures.TestBase, AssertsCompiledSQL):
__dialect__ = "default"
- def tear_down(self):
- functions._registry.clear()
+ def setup(self):
+ self._registry = deepcopy(functions._registry)
+ self._case_sensitive_registry = deepcopy(
+ functions._case_sensitive_registry)
+
+ def teardown(self):
+ functions._registry = self._registry
+ functions._case_sensitive_registry = self._case_sensitive_registry
def test_compile(self):
for dialect in all_dialects(exclude=("sybase",)):
@@ -87,6 +95,9 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL):
dialect=dialect,
)
+ functions._registry['_default'].pop('fake_func')
+ functions._case_sensitive_registry['_default'].pop('fake_func')
+
def test_use_labels(self):
self.assert_compile(
select([func.foo()], use_labels=True), "SELECT foo() AS foo_1"
@@ -100,7 +111,7 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL):
def test_uppercase(self):
# for now, we need to keep case insensitivity
- self.assert_compile(func.NOW(), "NOW()")
+ self.assert_compile(func.UNREGISTERED_FN(), "UNREGISTERED_FN()")
def test_uppercase_packages(self):
# for now, we need to keep case insensitivity
@@ -219,6 +230,37 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL):
assert isinstance(func.myfunc().type, DateTime)
+ def test_case_sensitive(self):
+ class MYFUNC(GenericFunction):
+ type = DateTime
+
+ assert isinstance(func.MYFUNC().type, DateTime)
+ assert isinstance(func.MyFunc().type, DateTime)
+ assert isinstance(func.mYfUnC().type, DateTime)
+ assert isinstance(func.myfunc().type, DateTime)
+
+ def test_replace_function(self):
+ class replaceable_func(GenericFunction):
+ type = Integer
+ identifier = 'replaceable_func'
+
+ assert isinstance(func.Replaceable_Func().type, Integer)
+ assert isinstance(func.RePlAcEaBlE_fUnC().type, Integer)
+ assert isinstance(func.replaceable_func().type, Integer)
+
+ with expect_warnings(
+ "The GenericFunction 'replaceable_func' is already registered and "
+ "is going to be overriden.",
+ regex=False
+ ):
+ class replaceable_func_override(GenericFunction):
+ type = DateTime
+ identifier = 'replaceable_func'
+
+ assert isinstance(func.Replaceable_Func().type, DateTime)
+ assert isinstance(func.RePlAcEaBlE_fUnC().type, DateTime)
+ assert isinstance(func.replaceable_func().type, DateTime)
+
def test_custom_w_custom_name(self):
class myfunc(GenericFunction):
name = "notmyfunc"
@@ -267,9 +309,19 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL):
type = Integer
identifier = "buf3"
+ class GeoBufferFour(GenericFunction):
+ type = Integer
+ name = "BufferFour"
+ identifier = "Buf4"
+
self.assert_compile(func.geo.buf1(), "BufferOne()")
self.assert_compile(func.buf2(), "BufferTwo()")
self.assert_compile(func.buf3(), "BufferThree()")
+ self.assert_compile(func.Buf4(), "BufferFour()")
+ self.assert_compile(func.BuF4(), "BufferFour()")
+ self.assert_compile(func.bUf4(), "BufferFour()")
+ self.assert_compile(func.bUf4_(), "BufferFour()")
+ self.assert_compile(func.buf4(), "BufferFour()")
def test_custom_args(self):
class myfunc(GenericFunction):