zena 1.0.0.beta3 → 1.0.0.rc1

data/test/integration/query_node/complex.yml

@@ -5,8 +5,8 @@ default:
     visitor: complex_admin
     site: complex
   src: ""
-  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.parent_id = ? ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.id]"
-  res: "courses, cskin, employees, jobs"
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.parent_id = ? ORDER BY nodes.zip ASC}, @node.id]"
+  res: "cskin, list of employees, jobs, courses list"
 
 assigned_jobs:
   context:
@@ -20,27 +20,28 @@ courses_assigned_to_driver_team:
     node: driver_team
     class: Page
   src: assigned_courses
-  res: "formulateProblems, transmitInformation"
+  res: "problem formulation, information transmission"
 
 all_courses_in_driver:
   context:
     node: driver
     class: Employee
   src: assigned_courses from pages in project
-  res: "dangerousTransportations, engine, formulateProblems, transmitInformation"
+  res: "dangerous transportations, problem formulation, information transmission, engine maintenance"
 
 all_courses_for_roger:
   context:
     node: roger
     class: Employee
   src: assigned_courses from pages in project from assigned_jobs
-  res: "dangerousTransportations, engine, fiberJunction, formulateProblems, radioUsage, secureASite, transmitInformation, winchUsage"
+  res: "dangerous transportations, problem formulation, information transmission, engine maintenance, secure a site, how to use the winch, how to use the radio, fiber junction"
+
 all_courses_for_joe:
   context:
     node: joe
     class: Employee
   src: assigned_courses from pages in project from assigned_jobs
-  res: "fiberJunction, formulateProblems, radioUsage, secureASite, transmitInformation, winchUsage"
+  res: "problem formulation, information transmission, secure a site, how to use the winch, how to use the radio, fiber junction"
 
 all_courses_for_mike:
   context:
@@ -49,21 +50,21 @@ all_courses_for_mike:
   src: assigned_courses from pages in project from assigned_jobs
   # TODO: optimization
   #sql: "[%Q{SELECT no1.*,li1.id AS link_id,links.status AS l_status,links.comment AS l_comment,links.date AS l_date FROM links,nodes,nodes AS no1,links AS li1 WHERE no1.id = li1.target_id AND li1.relation_id = 512923747 AND li1.source_id = nodes.id AND nodes.kpath LIKE 'NP%' AND nodes.project_id = links.target_id AND links.relation_id = 813976280 AND links.source_id = \#{@node.id} AND (\#{@node.secure_scope('no1')}) GROUP BY no1.id ORDER BY no1.position ASC, no1.node_name ASC}]"
-  res: "fiberJunction, formulateProblems, radioUsage, respManagement, secureASite, teamMotivation, transmitInformation, vision, winchUsage"
+  res: "problem formulation, information transmission, secure a site, how to use the winch, how to use the radio, fiber junction, responsabilities management, motivate your team, our vision"
 
 all_achieved_formations_for_roger:
   context:
     node: roger
     class: Employee
   src: assigned_formations where l_status eq 100
-  res: fiber2003, form2006, transm2001, transm2002, transp2004
+  res: dtransp 2004, fiber 2003, formprobs 2006, transinfo 2001, transinfo 2002
 
 custom_query_form_date:
   context:
     node: roger
     class: Employee
-  src: emp_form_dates order by node_name ASC
-  res: "dangerousTransportations, engine, fiberJunction, formulateProblems, radioUsage, secureASite, transmitInformation, winchUsage"
+  src: emp_form_dates order by title ASC
+  res: "dangerous transportations, engine maintenance, fiber junction, how to use the radio, how to use the winch, information transmission, problem formulation, secure a site"
 
 custom_query_form_with_where:
   context:
@@ -71,21 +72,21 @@ custom_query_form_with_where:
     class: Employee
     date: 2005-03-01
   src: "emp_form_dates where last_date is null or (repeat_every is not null and next_date lt #{date} + 6 month)"
-  res: "secureASite, winchUsage, engine, transmitInformation, fiberJunction, radioUsage"
+  res: "how to use the winch, secure a site, engine maintenance, information transmission, fiber junction, how to use the radio"
 
 find_employees_related_to_a_course__formulate_problems:
   context:
     node: transmit_information
     class: Course
   src: assigned_employees from jobs:project from assigned_pages
-  res: 'joe, mike, roger'
+  res: 'Roger Ubercool, Joe Friendly, Mike Mean'
 
 find_employees_related_to_a_course__fiber_junction:
   context:
     node: fiber_junction
     class: Course
   src: assigned_employees from jobs:project from assigned_pages
-  res: 'joe, mike, roger'
+  res: 'Roger Ubercool, Joe Friendly, Mike Mean'
 
 
 find_employees_related_to_a_course__vision:
@@ -93,19 +94,23 @@ find_employees_related_to_a_course__vision:
     node: vision
     class: Course
   src: assigned_employees from jobs:project from assigned_pages
-  res: 'mike'
+  res: 'Mike Mean'
 
 course_emp_date:
   context:
     node: transmit_information
     class: Course
   src: "course_emp_dates"
-  res: "joe, mike, roger"
+  res: "Joe Friendly, Mike Mean, Roger Ubercool"
 
 all_course_emp_date:
   src: "assigned_employees from jobs:project from assigned_pages from courses in site"
-  res: "joe, mike, roger"
+  res: "Roger Ubercool, Joe Friendly, Mike Mean"
 
 courses_with_rep:
-  src: "courses where custom_a is not null in site order by node_name ASC"
-  res: "dangerousTransportations, engine, fiberJunction, radioUsage, respManagement, secureASite, teamMotivation, transmitInformation, vision, winchUsage"
+  src: "courses where custom_a is not null in site order by title ASC"
+  res: "dangerous transportations, engine maintenance, fiber junction, how to use the radio, how to use the winch, information transmission, motivate your team, our vision, responsabilities management, secure a site"
+  
+it_should_use_alias_in_filters:
+  src: "alias_query where event_at < now in site"
+  sql: "%Q{SELECT (log_at + INTERVAL 6 months) AS event_at FROM nodes WHERE #{secure_scope('nodes')} AND ((log_at + INTERVAL 6 months)) < now() ORDER BY nodes.zip ASC}"

data/test/integration/query_node/dates.yml

@@ -7,15 +7,15 @@ default:
 
 now:
   src: "nodes where event_at < now"
-  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.event_at < now() AND nodes.parent_id = ? ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.id]"
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.event_at < now() AND nodes.parent_id = ? ORDER BY nodes.zip ASC}, @node.id]"
 
 now_interval:
   src: "nodes where created_at > now - 4 days"
-  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.created_at > now() - INTERVAL 4 DAY AND nodes.parent_id = ? ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.id]"
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.created_at > now() - INTERVAL 4 DAY AND nodes.parent_id = ? ORDER BY nodes.zip ASC}, @node.id]"
 
 year:
   src: "nodes where event_at.year < now.year"
-  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND year(nodes.event_at) < year(now()) AND nodes.parent_id = ? ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.id]"
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND year(nodes.event_at) < year(now()) AND nodes.parent_id = ? ORDER BY nodes.zip ASC}, @node.id]"
 
 year_on_whatever:
   src: "nodes where id.year < now.year"

data/test/integration/query_node/errors.yml

@@ -8,5 +8,11 @@ site:
   err: "Unknown relation 'site'."
 
 pages_from_site_or_images:
+  # should be 'in site'
   src: '(project from site) or images'
-  err: "Unknown relation 'site'."
+  err: "Unknown relation 'site'."
+
+pagination_without_limit:
+  src: "pages in site paginate p"
+  # qb processor.rb 571
+  err: 'Invalid paginate clause (used without limit).'

data/test/integration/query_node/filters.yml

@@ -4,7 +4,7 @@ default:
     node: 'cleanWater'
     visitor: 'ant'
   src: "nodes where log_at = event_at in site"
-  sql: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.log_at = nodes.event_at ORDER BY nodes.position ASC, nodes.node_name ASC}"
+  sql: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.log_at = nodes.event_at ORDER BY nodes.zip ASC}"
 
 id_becomes_zip:
   src: "nodes where id ne 1"
@@ -14,21 +14,21 @@ year_function:
   context:
     visitor: 'lion'
   src: "nodes where updated_at.year = 2007 in project"
-  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND year(nodes.updated_at) = 2007 AND nodes.project_id = ? ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.get_project_id]"
-  sqlite3: "[%Q{SELECT nodes.* FROM nodes,versions WHERE #{secure_scope('nodes')} AND nodes.project_id = ? AND strftime('%Y', versions.updated_at)*1 = 2007 AND nodes.id = versions.node_id GROUP BY nodes.id ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.get_project_id]"
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND year(nodes.updated_at) = 2007 AND nodes.project_id = ? ORDER BY nodes.zip ASC}, @node.get_project_id]"
+  sqlite3: "[%Q{SELECT nodes.* FROM nodes,versions WHERE #{secure_scope('nodes')} AND nodes.project_id = ? AND strftime('%Y', versions.updated_at)*1 = 2007 AND nodes.id = versions.node_id GROUP BY nodes.id ORDER BY nodes.zip ASC}, @node.get_project_id]"
   res: "crocodiles"
 
 two_fields:
   src: "notes where event_at = log_at in site"
-  sql: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.event_at = nodes.log_at AND nodes.kpath LIKE 'NN%' ORDER BY nodes.position ASC, nodes.node_name ASC}"
+  sql: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.event_at = nodes.log_at AND nodes.kpath LIKE 'NN%' ORDER BY nodes.zip ASC}"
 
 filter_l_status:
   context:
     node:  art
     class: Tag
   src: "tagged where l_status > 5"
-  sql: "[%Q{SELECT nodes.*,links.id AS link_id,links.status AS l_status,links.comment AS l_comment,links.date AS l_date FROM links,nodes WHERE #{secure_scope('nodes')} AND links.status > 5 AND nodes.id = links.source_id AND links.relation_id = _ID(node_has_tags) AND links.target_id = ? ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.id]"
-  res: "cleanWater"
+  sql: "[%Q{SELECT nodes.*,links.id AS link_id,links.status AS l_status,links.comment AS l_comment,links.date AS l_date FROM links,nodes WHERE #{secure_scope('nodes')} AND links.status > 5 AND nodes.id = links.source_id AND links.relation_id = _ID(node_has_tags) AND links.target_id = ? ORDER BY nodes.zip ASC}, @node.id]"
+  res: "Clean Water project"
 
 param_filter:
   context:
@@ -36,9 +36,8 @@ param_filter:
     class: Tag
     params:
       tag: c
-  src: 'nodes where node_name like "#{params[:tag]}%" in site'
-  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.node_name LIKE ? ORDER BY nodes.position ASC, nodes.node_name ASC}, \"#{params[:tag]}%\"]"
-  res: "cleanWater, collections, crocodiles"
+  src: 'nodes where zip like "#{params[:tag]}%" in site'
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.zip LIKE ? ORDER BY nodes.zip ASC}, \"#{params[:tag]}%\"]"
 
 param_filter_no_string:
   old_src: "notes where created_at gt REF_DATE - param:f in site"
@@ -46,13 +45,13 @@ param_filter_no_string:
   sql: "/nodes.created_at\ > now\(\) - \? /"
 
 filter_literal:
-  src: "nodes where node_name like 'w%' in site"
-  sql: "/name LIKE 'w%'/"
-  res: "water, wiki, wikiSkin"
+  src: "nodes where kpath like 'NPP%' in site"
+  sql: "/kpath LIKE 'NPP%'/"
+  res: "Zena the wild CMS, Clean Water project, a wiki with Zena"
 
 filter_literal_first:
   src: "nodes where #{params[:tag]} = 'two'"
-  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND ? = 'two' AND nodes.parent_id = ? ORDER BY nodes.position ASC, nodes.node_name ASC}, params[:tag], @node.id]"
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND ? = 'two' AND nodes.parent_id = ? ORDER BY nodes.zip ASC}, params[:tag], @node.id]"
 
 links_in_merged_queries:
   # Some queries have links, others don't. Merging should not mess things up.
@@ -61,38 +60,39 @@ links_in_merged_queries:
     class: Tag
     params:
       tag: 'op'
-  src: "(nodes where node_name like \"%#{params[:tag]}%\" and \"#{params[:tag]}\" ne '' in site) or (tagged where l_status > 5)"
-  res: "cleanWater, Node-+popupLayout, opening, people"
+  src: "(nodes where title like \"%#{params[:tag]}%\" and \"#{params[:tag]}\" ne '' in site) or (tagged where l_status > 5)"
+  # CleanWater is tagged, the rest contains 'op'
+  res: "people, Solenopsis Invicta, Clean Water project, Top menu, Node-+popupLayout"
 
-pages_group_by_node_name:
-  src: 'pages group by node_name'
-  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.kpath LIKE 'NP%' AND nodes.parent_id = ? GROUP BY nodes.node_name ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.id]"
-  res: "crocodiles, status, track"
+pages_group_by_zip:
+  src: 'contacts in site group by zip'
+  sql: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.kpath LIKE 'NRC%' GROUP BY nodes.zip ORDER BY nodes.zip ASC}"
+  res: "Solenopsis Invicta, Panthera Tigris Sumatran, Panthera Leo Verneyi, The lake we love, Mr nobody"
 
 nodes_group_by_year:
-  src: "nodes in site group by log_at.year order by log_at.year asc, node_name ASC"
-  sql: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} GROUP BY year(nodes.log_at) ORDER BY year(nodes.log_at) ASC, nodes.node_name ASC}"
-  sqlite3: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} GROUP BY strftime('%Y', nodes.log_at)*1 ORDER BY strftime('%Y', nodes.log_at)*1 ASC, nodes.node_name ASC}"
+  src: "nodes in site group by log_at.year order by log_at.year asc, zip ASC"
+  sql: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} GROUP BY year(nodes.log_at) ORDER BY year(nodes.log_at) ASC, nodes.zip ASC}"
+  sqlite3: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} GROUP BY strftime('%Y', nodes.log_at)*1 ORDER BY strftime('%Y', nodes.log_at)*1 ASC, nodes.zip ASC}"
 
 negative_value:
   src: "notes where custom_a ne -10 in site"
-  sql: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.custom_a <> -10 AND nodes.kpath LIKE 'NN%' ORDER BY nodes.position ASC, nodes.node_name ASC}"
+  sql: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.custom_a <> -10 AND nodes.kpath LIKE 'NN%' ORDER BY nodes.zip ASC}"
 
 filter_through_links:
   src: "nodes where (set_tag_id = 33 and hot_id = 22) in site"
   sql: "/jn1\.zip = 33 AND jn2\.zip = 22.*nodes.id = links.source_id/"
-  res: "cleanWater"
+  res: "Clean Water project"
 
 filter_with_fullpath:
   # Get all objects under a given node (node the '/' to avoid self)
   src: "nodes where fullpath like \"#{fullpath}/%\" in site order by fullpath"
   sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.fullpath LIKE ? ORDER BY nodes.fullpath}, \"#{@node.fullpath}/%\"]"
-  res: 'crocodiles, lake, lakeAddress, opening, status, track, water'
+  res: "Etat des travaux, The lake we love, it's a lake, water, crocodiles, super ouverture, Keeping things clean !"
 
 class_filter:
   src: "nodes where class like Image or class = Project in site"
-  sql: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND (nodes.kpath LIKE 'NDI%' OR nodes.kpath = 'NPP') GROUP BY id ORDER BY nodes.position ASC, nodes.node_name ASC}"
-  res: 'bird, cleanWater, flower, lake, tree, wiki, zena'
+  sql: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND (nodes.kpath LIKE 'NDI%' OR nodes.kpath = 'NPP') GROUP BY id ORDER BY nodes.zip ASC}"
+  res: "Zena the wild CMS, Clean Water project, it's a lake, bird, flower, Autumn Tree"
 
 class_filter_with_quotes:
   src: "nodes where class = 'Project' and title = 'k' in site"
@@ -104,8 +104,8 @@ klass_filter:
 
 role_filter:
   src: "nodes where role = Original in site"
-  sql: "%Q{SELECT nodes.* FROM nodes,nodes_roles WHERE #{secure_scope('nodes')} AND (nodes_roles.node_id = nodes.id AND nodes_roles.role_id = 493147733) ORDER BY nodes.position ASC, nodes.node_name ASC}"
-  res: 'tree'
+  sql: "%Q{SELECT nodes.* FROM nodes,nodes_roles WHERE #{secure_scope('nodes')} AND (nodes_roles.node_id = nodes.id AND nodes_roles.role_id = 493147733) ORDER BY nodes.zip ASC}"
+  res: 'Autumn Tree'
 
 role_filter_string:
   src: "nodes where role = 'Original' in site"
@@ -113,16 +113,22 @@ role_filter_string:
 
 role_as_relation_filter:
   src: "originals in site"
-  sql: "%Q{SELECT nodes.* FROM nodes,nodes_roles WHERE #{secure_scope('nodes')} AND nodes_roles.role_id = 493147733 AND nodes_roles.node_id = nodes.id ORDER BY nodes.position ASC, nodes.node_name ASC}"
-  res: 'tree'
+  sql: "%Q{SELECT nodes.* FROM nodes,nodes_roles WHERE #{secure_scope('nodes')} AND nodes_roles.role_id = 493147733 AND nodes_roles.node_id = nodes.id ORDER BY nodes.zip ASC}"
+  res: 'Autumn Tree'
 
 filter_by_parent:
   src: "nodes where parent_id = 11 in site"
 #       nodes where parent.zip = ...
-  sql: "%Q{SELECT nodes.* FROM nodes,nodes AS jn1 WHERE #{secure_scope('nodes')} AND jn1.zip = 11 AND jn1.id = nodes.parent_id AND jn1.site_id = nodes.site_id ORDER BY nodes.position ASC, nodes.node_name ASC}"
-  res: 'collections, letter, nature, people, projects, skins'
+  sql: "%Q{SELECT nodes.* FROM nodes,nodes AS jn1 WHERE #{secure_scope('nodes')} AND jn1.zip = 11 AND jn1.id = nodes.parent_id AND jn1.site_id = nodes.site_id ORDER BY nodes.zip ASC}"
+  res: 'people, projects list, Collections, Nature, zena enhancements, Skins (layout themes)'
 #many_role_filter:
 # This is not working (or clause on 'indexed' fields is not supported right now)
 #  src: "nodes where role = Original or role = Task in site"
-#  sql: "%Q{SELECT nodes.* FROM nodes,nodes_roles WHERE #{secure_scope('nodes')} AND ((nodes_roles.node_id = nodes.id AND nodes_roles.role_id = 493147733) OR (nodes_roles.node_id = nodes.id AND nodes_roles.role_id = 1793452896)) ORDER BY nodes.position ASC, nodes.node_name ASC}"
-#  res: 'nature'
+#  sql: "%Q{SELECT nodes.* FROM nodes,nodes_roles WHERE #{secure_scope('nodes')} AND ((nodes_roles.node_id = nodes.id AND nodes_roles.role_id = 493147733) OR (nodes_roles.node_id = nodes.id AND nodes_roles.role_id = 1793452896)) ORDER BY nodes.zip ASC}"
+#  res: 'nature'
+
+quoted_literal:
+  src: "nodes where tag=\"10'000\" in site"
+  sql: "%Q{SELECT nodes.* FROM links AS ta1,nodes WHERE #{secure_scope('nodes')} AND ta1.comment = '10\\\\'000' AND nodes.id = ta1.source_id AND ta1.relation_id IS NULL ORDER BY nodes.zip ASC}"
+  res: ''
+# filters on ml strings are in properties.yml

data/test/integration/query_node/idx_fields.yml

@@ -0,0 +1,11 @@
+default:
+  context:
+    node_name: '@node'
+    node: 'cleanWater'
+    visitor: 'ant'
+
+# FIELD BASED INDEX (= alias)
+
+find_datetime:
+  src: "posts where date.year = '2006' in site"
+  sql: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND year(nodes.idx_datetime1) = '2006' AND nodes.kpath LIKE 'NNP%' ORDER BY nodes.zip ASC}"

data/test/integration/query_node/idx_key_value.yml

@@ -0,0 +1,77 @@
+default:
+  context:
+    node_name: '@node'
+    node: 'cleanWater'
+    visitor: 'ant'
+
+ml_title_where:
+  src: "nodes where title like 'Etat%' in site"
+  sql: "%Q{SELECT nodes.* FROM idx_nodes_ml_strings AS ml1,nodes WHERE #{secure_scope('nodes')} AND ml1.value LIKE 'Etat%' AND ml1.lang = 'fr' AND ml1.key = 'title' AND ml1.node_id = nodes.id ORDER BY nodes.zip ASC}"
+  res: 'Etat des travaux'
+
+ml_title_where_with_or:
+  src: "nodes where title like 'Etat%' or class = Letter in site"
+  sql: "%Q{SELECT nodes.* FROM idx_nodes_ml_strings AS ml1,nodes WHERE #{secure_scope('nodes')} AND ((ml1.value LIKE 'Etat%' AND ml1.lang = 'fr' AND ml1.key = 'title' AND ml1.node_id = nodes.id) OR (nodes.kpath = 'NNL' AND ml1.node_id = 0)) GROUP BY nodes.id ORDER BY nodes.zip ASC}"
+  res: 'Etat des travaux, zena enhancements'
+
+name_where:
+  src: "contacts where name like 'Inv%' in site"
+  sql: "%Q{SELECT nodes.* FROM idx_nodes_strings AS st1,nodes WHERE #{secure_scope('nodes')} AND st1.value LIKE 'Inv%' AND st1.key = 'name' AND st1.node_id = nodes.id AND nodes.kpath LIKE 'NRC%' ORDER BY nodes.zip ASC}"
+  res: 'Solenopsis Invicta'
+
+# TODO: Only implement with a proper use case. Ref [#190]
+#       this is really more complex then it seems if we do not want too bad performance. Easiest way:
+#       NOT EXISTS (SELECT 'x' FROM idx_nodes_ml_strings AS im WHERE im.node_id = nodes.id AND im.key = 'title' AND im.lang = 'fr')
+# indexed_value_is_null:
+#   src: "projects where title is null in site"
+#   sql: "%Q{SELECT nodes.* FROM idx_nodes_ml_strings,nodes WHERE #{secure_scope('nodes')} AND idx_nodes_ml_strings.value IS NULL AND idx_nodes_ml_strings.key = 'title' AND idx_nodes_ml_strings.node_id = nodes.id AND nodes.kpath LIKE 'NPP%' ORDER BY nodes.zip ASC}"
+#   res: "wiki, zena"
+
+ml_title_order:
+  context:
+    node: 'cleanWater'
+  src: "pages in site order by title asc limit 7"
+  sql: "%Q{SELECT nodes.* FROM idx_nodes_ml_strings AS ml1,nodes WHERE #{secure_scope('nodes')} AND ml1.lang = 'fr' AND ml1.key = 'title' AND ml1.node_id = nodes.id AND nodes.kpath LIKE 'NP%' ORDER BY ml1.value ASC LIMIT 7}"
+  res: "a wiki with Zena, Art, Clean Water project, Collections, crocodiles, Default skin, Etat des travaux"
+
+
+ml_title_filter_in_relation:
+  src: "references where title = 'important'"
+  sql: "/idx_nodes_ml_strings AS ml1.*ml1.value = 'important'.*lang = 'fr'.*key = 'title'.*nodes.id = links.target_id.*source_id = \?/"
+  res: ""
+
+
+filter_ml_string:
+  context:
+    lang: 'de'
+  src: "nodes where title = 'foo' in site"
+  sql: "%Q{SELECT nodes.* FROM idx_nodes_ml_strings AS ml1,nodes WHERE #{secure_scope('nodes')} AND ml1.value = 'foo' AND ml1.lang = 'fr' AND ml1.key = 'title' AND ml1.node_id = nodes.id ORDER BY nodes.zip ASC}"
+
+filter_ml_string_order:
+  context:
+    lang: 'de'
+  src: "nodes where title = 'foo' in site order by title"
+  sql: "%Q{SELECT nodes.* FROM idx_nodes_ml_strings AS ml1,nodes WHERE #{secure_scope('nodes')} AND ml1.value = 'foo' AND ml1.lang = 'fr' AND ml1.key = 'title' AND ml1.node_id = nodes.id ORDER BY ml1.value}"
+
+filter_ml_string_twice:
+  context:
+    lang: 'de'
+  src: "nodes where title = 'foo' and title = 'baz' in site"
+  sql: "%Q{SELECT nodes.* FROM idx_nodes_ml_strings AS ml1,nodes WHERE #{secure_scope('nodes')} AND ml1.value = 'foo' AND ml1.value = 'baz' AND ml1.lang = 'fr' AND ml1.key = 'title' AND ml1.node_id = nodes.id ORDER BY nodes.zip ASC}"
+
+  
+ml_title_with_name:
+  src: "contacts where title like '%Invicta%' or name = 'Leo Verneyi' in site"
+  sql: "/ml1.*st1/"
+  res: 'Solenopsis Invicta, Panthera Leo Verneyi'
+  
+ml_title_with_name_with_sort:
+  src: "contacts where title like '%Invicta%' or name = 'Leo Verneyi' in site order by title"
+  sql: "/ml1.*ml2.*st1/"
+  res: 'Panthera Leo Verneyi, Solenopsis Invicta'
+  
+# Group by property
+group_by_ml_title:
+  src: 'contacts in site group by title'
+  sql: "%Q{SELECT nodes.* FROM idx_nodes_ml_strings AS ml1,nodes WHERE #{secure_scope('nodes')} AND ml1.lang = 'fr' AND ml1.key = 'title' AND ml1.node_id = nodes.id AND nodes.kpath LIKE 'NRC%' GROUP BY ml1.value ORDER BY nodes.zip ASC}"
+  res: "Solenopsis Invicta, Panthera Tigris Sumatran, Panthera Leo Verneyi, The lake we love, Mr nobody"

data/test/integration/query_node/idx_scope.yml

@@ -0,0 +1,33 @@
+default:
+  context:
+    node_name: '@node'
+    node: 'cleanWater'
+    visitor: 'ant'
+  src: "blogs where blog.title = 'a wiki with Zena' in site"
+  sql: "%Q{SELECT nodes.* FROM idx_projects AS sc1,nodes WHERE #{secure_scope('nodes')} AND sc1.blog_title = 'a wiki with Zena' AND nodes.id = sc1.node_id AND nodes.kpath LIKE 'NPPB%' ORDER BY nodes.zip ASC}"
+  res: 'a wiki with Zena'
+
+# CUSTOM TABLE BASED INDEX
+
+get_kpath_from_class:
+  src: "blogs where contact.name = 'xx' in site"
+  sql: "%Q{SELECT nodes.* FROM idx_projects AS sc1,nodes WHERE #{secure_scope('nodes')} AND sc1.contact_name = 'xx' AND nodes.id = sc1.node_id AND nodes.kpath LIKE 'NPPB%' ORDER BY nodes.zip ASC}"
+
+get_kpath_from_class_with_function:
+  src: "blogs where tag.created_at.year = 'xx' in site"
+  sql: "%Q{SELECT nodes.* FROM idx_projects AS sc1,nodes WHERE #{secure_scope('nodes')} AND year(sc1.tag_created_at) = 'xx' AND nodes.id = sc1.node_id AND nodes.kpath LIKE 'NPPB%' ORDER BY nodes.zip ASC}"
+
+many_keys:
+  src: "blogs where blog.title = 'a wiki with Zena' and contact.name = 'cont' in site"
+  sql: "%Q{SELECT nodes.* FROM idx_projects AS sc1,nodes WHERE #{secure_scope('nodes')} AND sc1.blog_title = 'a wiki with Zena' AND sc1.contact_name = 'cont' AND nodes.id = sc1.node_id AND nodes.kpath LIKE 'NPPB%' ORDER BY nodes.zip ASC}"
+  res: 'a wiki with Zena'
+
+or_keys:
+  src: "blogs where blog.title = 'bad' or contact.name = 'cont' in site"
+  sql: "%Q{SELECT nodes.* FROM idx_projects AS sc1,nodes WHERE #{secure_scope('nodes')} AND ((sc1.blog_title = 'bad' AND nodes.id = sc1.node_id) OR (sc1.contact_name = 'cont' AND nodes.id = sc1.node_id)) AND nodes.kpath LIKE 'NPPB%' GROUP BY nodes.id ORDER BY nodes.zip ASC}"
+  res: 'a wiki with Zena'
+
+id_key:
+  src: "blogs where id = 29 in site"
+  sql: '!/idx_projects/'
+  res: 'a wiki with Zena'

data/test/integration/query_node/relations.yml

@@ -4,10 +4,10 @@ default:
     node: 'cleanWater'
     visitor: 'ant'
   src: ""
-  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.parent_id = ? ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.id]"
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.parent_id = ? ORDER BY nodes.zip ASC}, @node.id]"
 
 nodes_from_nodes_in_section:
-  sql: "[%Q{SELECT nodes.* FROM nodes,nodes AS no1 WHERE #{secure_scope('nodes')} AND nodes.parent_id = no1.id AND no1.section_id = ? GROUP BY nodes.id ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.get_section_id]"
+  sql: "[%Q{SELECT nodes.* FROM nodes,nodes AS no1 WHERE #{secure_scope('nodes')} AND nodes.parent_id = no1.id AND no1.section_id = ? GROUP BY nodes.id ORDER BY nodes.zip ASC}, @node.get_section_id]"
 
 bad_relation:
   src: "categories in site"
@@ -15,23 +15,23 @@ bad_relation:
 
 overriden_relation:
   src: 'references'
-  sql: "[%Q{SELECT nodes.*,links.id AS link_id,links.status AS l_status,links.comment AS l_comment,links.date AS l_date FROM links,nodes WHERE #{secure_scope('nodes')} AND nodes.id = links.target_id AND links.relation_id = _ID(node_has_references) AND links.source_id = ? ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.id]"
+  sql: "[%Q{SELECT nodes.*,links.id AS link_id,links.status AS l_status,links.comment AS l_comment,links.date AS l_date FROM links,nodes WHERE #{secure_scope('nodes')} AND nodes.id = links.target_id AND links.relation_id = _ID(node_has_references) AND links.source_id = ? ORDER BY nodes.zip ASC}, @node.id]"
 
 link_selects_in_sub_query:
   src: "icons or images"
-  sql: "[%Q{SELECT nodes.*,links.id AS link_id,links.status AS l_status,links.comment AS l_comment,links.date AS l_date FROM links,nodes WHERE #{secure_scope('nodes')} AND ((nodes.id = links.target_id AND links.relation_id = _ID(node_has_an_icon) AND links.source_id = ?) OR (nodes.kpath LIKE 'NDI%' AND nodes.parent_id = ? AND links.id = 0)) GROUP BY nodes.id ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.id, @node.id]"
+  sql: "[%Q{SELECT nodes.*,links.id AS link_id,links.status AS l_status,links.comment AS l_comment,links.date AS l_date FROM links,nodes WHERE #{secure_scope('nodes')} AND ((nodes.id = links.target_id AND links.relation_id = _ID(node_has_an_icon) AND links.source_id = ?) OR (nodes.kpath LIKE 'NDI%' AND nodes.parent_id = ? AND links.id = 0)) GROUP BY nodes.id ORDER BY nodes.zip ASC}, @node.id, @node.id]"
 
 projects_from_tags:
   sql: "/nodes.id = no1.project_id AND no1.kpath LIKE 'NPT%' AND no1.parent_id = ?/"
 
 projects_in_site:
-  sql: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.kpath LIKE 'NPP%' ORDER BY nodes.position ASC, nodes.node_name ASC}"
+  sql: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.kpath LIKE 'NPP%' ORDER BY nodes.zip ASC}"
 
 nodes_in_section:
   context:
     node: 'people'
-  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.section_id = ? ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.get_section_id]"
-  res: "anonymous, ant, lion, myLife, tiger"
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.section_id = ? ORDER BY nodes.zip ASC}, @node.get_section_id]"
+  res: "Solenopsis Invicta, Panthera Tigris Sumatran, Panthera Leo Verneyi, My Life, Mr nobody"
 
 relation_from_class:
   src: "hot from projects in site"
@@ -45,31 +45,31 @@ same_name_as_class:
 same_name_as_class_in_site:
   # Creates pages relation in QueryNodeTest
   src: 'pages in site'
-  sql: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.kpath LIKE 'NP%' ORDER BY nodes.position ASC, nodes.node_name ASC}"
+  sql: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.kpath LIKE 'NP%' ORDER BY nodes.zip ASC}"
 
 same_name_as_class_not_valid:
   # Creates pages relation in QueryNodeTest
   src: 'pages'
-  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.kpath LIKE 'NP%' AND nodes.parent_id = ? ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.id]"
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.kpath LIKE 'NP%' AND nodes.parent_id = ? ORDER BY nodes.zip ASC}, @node.id]"
 
 root_should_be_project:
   context:
     # Make sure we do not start query on a Project so that we can tell if 'root' properly sets main_class.
     node: ant
   src: 'news from root'
-  sql: "%Q{SELECT nodes.*,links.id AS link_id,links.status AS l_status,links.comment AS l_comment,links.date AS l_date FROM links,nodes,nodes AS no1 WHERE #{secure_scope('nodes')} AND nodes.id = links.source_id AND links.relation_id = 488905946 AND links.target_id = no1.id AND no1.id = 850927283 GROUP BY nodes.id ORDER BY nodes.position ASC, nodes.node_name ASC}"
+  sql: "%Q{SELECT nodes.*,links.id AS link_id,links.status AS l_status,links.comment AS l_comment,links.date AS l_date FROM links,nodes,nodes AS no1 WHERE #{secure_scope('nodes')} AND nodes.id = links.source_id AND links.relation_id = 488905946 AND links.target_id = no1.id AND no1.id = 850927283 GROUP BY nodes.id ORDER BY nodes.zip ASC}"
 
 start_as_tag:
   context:
     node: art
   src: "tagged from tag:start"
   sql: '/no1.site_id = \? AND no1.zip = \?.*current_site.id, start_node_zip/'
-  res: 'cleanWater, opening'
+  res: 'Clean Water project, super ouverture'
 
 from_visitor:
   src: 'favorites from visitor'
-  sql: '/visitor.contact_id/'
-  res: 'nature'
+  sql: '/visitor.node_id/'
+  res: 'Nature'
 
 # l_date_as_date:
 #   src: "select *,if(l_date,l_date,event_at) AS date from (notes or assigned_notes) order by date"