Merge pull request #235 from SlivTime/remove-unused

Fixes for current sqlalchemy and pip

Author: SlivTime

Makefile

@@ -1,7 +1,7 @@
 
 venv-%:
 	test -d venv-${*} || virtualenv -p ${*} venv-${*}
-	venv-${*}/bin/pip install -e .[tests,web,fcgi,sqla,memcached,cleanhtml,renderhtml,images] --process-dependency-links
+	venv-${*}/bin/pip install -e .[tests,web,fcgi,sqla,memcached,cleanhtml,renderhtml,images]
 	touch venv-${*}/bin/activate
 
 devbuild-%: venv-%
@@ -12,16 +12,18 @@ devbuild-%: venv-%
 
 test-%: name ?= tests
 test-%: devbuild-%
-	venv-${*}/bin/py.test $(name) -q -r fEsxXw --strict
+	venv-${*}/bin/python -m pytest $(name) -q -r fEsxXw --strict
 
 coverage-%: devbuild-%
-	venv-${*}/bin/py.test tests --cov=venv-${*}/lib/${*}/site-packages/iktomi | sed -e "s/^venv-${*}\\/lib\\/${*}\\/site-packages\\///"
+	venv-${*}/bin/python -m pytest tests --cov=venv-${*}/lib/${*}/site-packages/iktomi | sed -e "s/^venv-${*}\\/lib\\/${*}\\/site-packages\\///"
 
 test2: test-python2.7
 test3: test-python3.5
 
 test: test2 test3
 coverage: coverage-python2.7
 
+clean:
+	rm -rf venv-python2.7 venv-python3.5
 #docs-%: devbuild
 #	cd doc && make SPHINXBUILD=../venv/bin/sphinx-build $*

iktomi/unstable/db/sqla/public_query.py

@@ -1,9 +1,36 @@
+import sqlalchemy
 from sqlalchemy.orm.query import Query
 from sqlalchemy.orm.util import AliasedClass
 from sqlalchemy.sql import ClauseElement, Join
 from sqlalchemy.sql.selectable import FromGrouping
 from sqlalchemy import cast, Boolean
 from sqlalchemy.orm.util import _class_to_mapper
+from sqlalchemy import event
+from sqlalchemy import inspect
+from packaging.version import parse as version
+
+
+def init_filter_event(prop_name):
+    @event.listens_for(Query, "before_compile", retval=True)
+    def before_compile(query):
+        """A query compilation rule that will add limiting criteria for every
+        subclass of HasPrivate"""
+        if query._execution_options.get("include_private", False):
+            return query
+
+        for ent in query.column_descriptions:
+            entity = ent['entity']
+            if entity is None:
+                continue
+            insp = inspect(ent['entity'])
+            mapper = getattr(insp, 'mapper', None)
+            if mapper and prop_name in dir(mapper.class_):
+                query = query.enable_assertions(False).filter(
+                    ent['entity'].public == True)
+
+        return query
+    
+    return before_compile
 
 
 class PublicQuery(Query):
@@ -17,10 +44,29 @@ class PublicQuery(Query):
 
     A version from recipe combined with our own vision
     http://www.sqlalchemy.org/trac/wiki/UsageRecipes/PreFilteredQuery
+
+    UPD in v0.6
+    Old recipe is outdated, we should use new one
+    https://github.com/sqlalchemy/sqlalchemy/wiki/FilteredQuery
+
+    Old functionality is untouched for compatibility
     '''
 
     property_name = 'public'
 
+    # Sqlalchemy version should be lower than this version to be able
+    # to handle all cases correctly
+    # For newer versions we will use more modern and simpler solution
+    # that cannot filter eager loading via joinedjoad
+    max_sqla_version = '1.2'
+
+    def __init__(self, *args, **kwargs):
+        if version(sqlalchemy.__version__) >= version(self.max_sqla_version):
+            init_filter_event(self.property_name)
+        super(PublicQuery, self).__init__(*args, **kwargs)
+        
+
+
     def get(self, ident):
         prop = self.property_name
         if self._criterion: # pragma: no cover

iktomi/unstable/db/sqla/replication.py

@@ -191,7 +191,8 @@ def replicate_no_merge(source, model, cache=None):
     elif source in cache:
         return cache[source]
     db = object_session(source)
-    cls, ident = identity_key(instance=source)
+    ident = identity_key(instance=source)[1]
+    assert ident is not None
     target = db.query(model).get(ident)
     if target is None:
         target = model()

setup.py

@@ -7,7 +7,7 @@
 extras_requires = {
     'web': ['webob'],
     'fcgi': ['flup6'],
-    'sqla': ['sqlalchemy'],
+    'sqla': ['sqlalchemy', 'packaging'],
     'memcached': ['python-memcached'],
     'cleanhtml': ['lxml'],
     'renderhtml': ['jinja2'],
@@ -16,10 +16,10 @@
 
 tests_requires = [
     'pymysql',
-    'testalchemy==0.4',
+    'testalchemy @ https://github.com/ods/testalchemy/tarball/master#egg=testalchemy-0.4',
     'pytest',
     'pytest-cov',
-    'mockcache==1.0.3_alpha',
+    'mockcache @ https://github.com/lunant/mockcache/tarball/master#egg=mockcache-1.0.3_alpha',
     'webtest',
 ]
 if sys.version_info[0] < 3:
@@ -34,7 +34,7 @@
 
 setup(
     name='iktomi',
-    version='0.5.2',
+    version='0.6',
     packages=['iktomi',
               'iktomi.utils',
               'iktomi.forms',