Merge pull request #170 from karlproject/use-karlex.community_zoid

Changed queries that use community id to use the new

Author: pauleveritt

CHANGES.txt

@@ -1,6 +1,9 @@
 karl package Changelog
 ======================
 
+- Changed queries that use community id to use the new
+  karlex.community_id column because it's updated more reliably.
+
 4.38.0 (2017-07-13)
 ===================
 

karl/box/apiviews.py

@@ -116,9 +116,8 @@ def token(self):
            (state->>'content_modified')::timestamp::text as last_activity,
            get_path(state) as path,
            (select count(*)
-            from newt sn
-            where get_community_zoid(sn.zoid, sn.class_name, sn.state) =
-                     newt.zoid
+            from newt sn natural join karlex
+            where karlex.community_zoid = newt.zoid
                   and
                   interfaces(sn.class_name) &&
                     array[

karl/content/views/blog.py

@@ -93,9 +93,10 @@ def show_blog_view(context, request):
     from newt.db import search
     community = find_community(context)
     community_cond = qbe.sql(context._p_jar, dict(community=community))
-    results = search.where(
+    results = search.search(
         context._p_jar,
         """
+        select * from newt natural join karlex where
         class_name = 'karl.content.models.blog.BlogEntry'
         and """ + community_cond + """
         and newt_can_view(state, %s)
@@ -581,7 +582,7 @@ def archive_portlet(context, request):
             """
             select month, count(*) from (
               select substring(state->>'created' from 1 for 7) as month
-              from newt
+              from newt natural join karlex
               where class_name = 'karl.content.models.blog.BlogEntry'
                 and """ + community_cond + """
                 and newt_can_view(state, %s)

karl/models/newtqbe.py

@@ -62,7 +62,7 @@ def iface_names(ifaces):
 $$ language plpgsql immutable;
 """
 from ZODB.utils import u64
-qbe['community'] = scalar("get_community_zoid(zoid, class_name, state)",
+qbe['community'] = scalar("karlex.community_zoid",
                           convert = lambda c: u64(c._p_oid))
 #
 #############################################################################
@@ -189,24 +189,18 @@ def __init__(self, context, request=None):
     def __call__(self, sort_index=None, reverse=False,
                  offset=None, limit=None, want_count=True,
                  **kw):
-        if sort_index is not None:
-            order_by = [(sort_index, reverse)]
-        else:
-            order_by = ()
+        sql = self.sql(sort_index, reverse, offset, limit, want_count, **kw)
 
         conn = self.context._p_jar
-        sql = qbe.sql(conn, dequerify(kw), order_by=order_by)
-        sql = "state ? '__parent__' AND state ? '__name__' AND \n" + sql
-
         if limit is not None:
             if want_count:
-                count, obs = newt.db.search.where_batch(
+                count, obs = newt.db.search.search_batch(
                     conn, sql, offset or 0, limit)
                 return count, obs, ob_resolver
 
             sql += ' limit %d' % limit
 
-        obs = newt.db.search.where(conn, sql)
+        obs = newt.db.search.search(conn, sql)
         return len(obs), obs, ob_resolver
 
     def sql(self, sort_index=None, reverse=False,
@@ -218,9 +212,16 @@ def sql(self, sort_index=None, reverse=False,
             order_by = ()
 
         sql = qbe.sql(self.context._p_jar, dequerify(kw), order_by=order_by)
-        sql = "state ? '__parent__' AND state ? '__name__' AND \n" + sql
+        if 'community' not in kw:
+            sql = "state ? '__parent__' AND state ? '__name__' AND \n" + sql
 
-        if limit is not None:
+        if 'karlex.' in sql:
+            sql = 'select * from newt natural join karlex\nwhere ' + sql
+        else:
+            sql = 'select * from newt\nwhere ' + sql
+
+
+        if limit is not None and not want_count:
             sql += ' limit %d' % limit
 
         return sql