zena 1.2.2 → 1.2.3

data/test/functional/nodes_controller_test.rb

@@ -1,6 +1,7 @@
 require 'test_helper'
 
 class NodesControllerTest < Zena::Controller::TestCase
+  include Zena::Use::Urls::Common
   context 'An anonymous user' do
     setup do
       login(:anon)
@@ -165,22 +166,21 @@ class NodesControllerTest < Zena::Controller::TestCase
 
       context 'asking for show' do
         subject do
+          @stamp = make_cachestamp(secure(Node) { Node.find(nodes_id(:projects))}, nil)
           {
             :action => 'show', :controller => 'nodes',
-            :path   => ["page#{nodes_zip(:projects)}_info.js"],
+            :path   => ["page#{nodes_zip(:projects)}_info.#{@stamp}.js"],
             :prefix => 'en'
           }
         end
 
         should 'recognize show page' do
-          assert_recognizes subject, "/en/page#{nodes_zip(:projects)}_info.js"
+          assert_recognizes subject, "/en/page#{nodes_zip(:projects)}_info.#{@stamp}.js"
         end
 
         should 'insert cachestamp and render template' do
           get_subject
-          #
-          assert_redirected_to "/en/page18_info.js?#{nodes(:projects).updated_at.to_i}"
-          get 'show', :path => subject[:path], :cachestamp => nodes(:projects).updated_at.to_i.to_s, :prefix => 'en'
+          get 'show', :path => subject[:path], :prefix => 'en'
           assert_response :success
           assert_equal '{some:"json"}', @response.body
         end
@@ -650,12 +650,12 @@ class NodesControllerTest < Zena::Controller::TestCase
     end # trying to destroy an inaccessible node
   end # A user
 
-
+  
   def test_foo
-    assert_generates '/en/img.jpg?1234', :controller => :nodes, :action => :show, :prefix => 'en', :path => ["img.jpg"], :cachestamp => '1234'
+    assert_generates '/en/img.ff823.jpg', :controller => :nodes, :action => :show, :prefix => 'en', :path => ["img.ff823.jpg"]
     assert_recognizes(
-      {:controller => 'nodes', :action => 'show', :prefix => 'en', :path => ["img.jpg"], :cachestamp => '1234'},
-      '/en/img.jpg?1234'
+      {:controller => 'nodes', :action => 'show', :prefix => 'en', :path => ["img.ff823.jpg"]},
+      '/en/img.ff823.jpg'
     )
   end
 
@@ -664,12 +664,12 @@ class NodesControllerTest < Zena::Controller::TestCase
     node = secure!(Node) { nodes(:bird_jpg) }
     get 'show', :prefix => 'oo', :path => ["image#{node.zip}.jpg"]
     # missing cache info
-    assert_redirected_to "/en/image#{node.zip}.jpg?#{node.updated_at.to_i}"
+    assert_redirected_to "/en/image#{node.zip}.#{make_cachestamp(node,nil)}.jpg"
     # bad cache info
-    get 'show', :prefix => 'en', :path => ["image#{node.zip}.jpg"], :cachestamp => '1234'
-    assert_redirected_to "/en/image#{node.zip}.jpg?#{node.updated_at.to_i}"
+    get 'show', :prefix => 'en', :path => ["image#{node.zip}.1234.jpg"]
+    assert_redirected_to "/en/image#{node.zip}.#{make_cachestamp(node,nil)}.jpg"
     # cache info ok
-    get 'show', :prefix => 'en', :path => ["image#{node.zip}.jpg"], :cachestamp => node.updated_at.to_i
+    get 'show', :prefix => 'en', :path => ["image#{node.zip}.#{make_cachestamp(node,nil)}.jpg"]
     assert_response :success
   end
 
@@ -678,12 +678,12 @@ class NodesControllerTest < Zena::Controller::TestCase
     node = secure!(Node) { nodes(:bird_jpg) }
     get 'show', :prefix => 'oo', :path => ["image#{node.zip}_pv.jpg"]
     # missing cache info, can use public image
-    assert_redirected_to "/en/image#{node.zip}_pv.jpg?#{node.updated_at.to_i + Iformat['pv'][:hash_id]}"
+    assert_redirected_to "/en/image#{node.zip}_pv.#{make_cachestamp(node,'pv')}.jpg"
     # bad cache info
-    get 'show', :prefix => 'en', :path => ["image#{node.zip}.jpg"], :cachestamp => '1234'
-    assert_redirected_to "/en/image#{node.zip}.jpg?#{node.updated_at.to_i}"
+    get 'show', :prefix => 'en', :path => ["image#{node.zip}.1234.jpg"]
+    assert_redirected_to "/en/image#{node.zip}.#{make_cachestamp(node,nil)}.jpg"
     # cache info ok
-    get 'show', :prefix => 'en', :path => ["image#{node.zip}.jpg"], :cachestamp => node.updated_at.to_i
+    get 'show', :prefix => 'en', :path => ["image#{node.zip}.#{make_cachestamp(node,nil)}.jpg"]
     assert_response :success
   end
 
@@ -692,12 +692,12 @@ class NodesControllerTest < Zena::Controller::TestCase
     node = secure!(Node) { nodes(:style_css) }
     get 'show', :prefix => 'oo', :path => ["textdocument#{node.zip}.css"]
     # missing cache info, should use public lang
-    assert_redirected_to "/en/textdocument#{node.zip}.css?#{node.updated_at.to_i}"
+    assert_redirected_to "/en/textdocument#{node.zip}.#{make_cachestamp(node,nil)}.css"
     # bad cache info
-    get 'show', :prefix => 'en', :path => ["textdocument#{node.zip}.css"], :cachestamp => '1234'
-    assert_redirected_to "/en/textdocument#{node.zip}.css?#{node.updated_at.to_i}"
+    get 'show', :prefix => 'en', :path => ["textdocument#{node.zip}.1234.css"]
+    assert_redirected_to "/en/textdocument#{node.zip}.#{make_cachestamp(node,nil)}.css"
     # cache info ok
-    get 'show', :prefix => 'en', :path => ["textdocument#{node.zip}.css"], :cachestamp => node.updated_at.to_i
+    get 'show', :prefix => 'en', :path => ["textdocument#{node.zip}.#{make_cachestamp(node,nil)}.css"]
     assert_response :success
   end
 
@@ -708,16 +708,16 @@ class NodesControllerTest < Zena::Controller::TestCase
         node = secure!(Node) { nodes(:bird_jpg) }
         get 'show', :prefix => 'en', :path => ["image#{node.zip}.jpg"]
         # missing cache info
-        assert_redirected_to "/en/image#{node.zip}.jpg?#{node.updated_at.to_i}"
+        assert_redirected_to "/en/image#{node.zip}.#{make_cachestamp(node,nil)}.jpg"
         assert !File.exist?("#{SITES_ROOT}/test.host/public/en/image#{node.zip}.jpg")
         # bad cache info
-        get 'show', :prefix => 'en', :path => ["image#{node.zip}.jpg"], :cachestamp => '1234'
-        assert_redirected_to "/en/image#{node.zip}.jpg?#{node.updated_at.to_i}"
-        assert !File.exist?("#{SITES_ROOT}/test.host/public/en/image#{node.zip}.jpg")
+        get 'show', :prefix => 'en', :path => ["image#{node.zip}.1234.jpg"]
+        assert_redirected_to "/en/image#{node.zip}.#{make_cachestamp(node,nil)}.jpg"
+        assert !File.exist?("#{SITES_ROOT}/test.host/public/en/image#{node.zip}.#{make_cachestamp(node,nil)}.jpg")
         # cache info ok
-        get 'show', :prefix => 'en', :path => ["image#{node.zip}.jpg"], :cachestamp => node.updated_at.to_i
+        get 'show', :prefix => 'en', :path => ["image#{node.zip}.#{make_cachestamp(node,nil)}.jpg"]
         assert_response :success
-        assert File.exist?(make_cache_path("#{SITES_ROOT}/test.host/public/en/image#{node.zip}.jpg", node))
+        assert File.exist?("#{SITES_ROOT}/test.host/public/en/image#{node.zip}.#{make_cachestamp(node,nil)}.jpg")
       end
     end
   end
@@ -778,10 +778,6 @@ END:VCALENDAR
     end
   end
 
-  def make_cache_path(file, node)
-    "#{file}.#{node.updated_at.to_i}"
-  end
-
   def test_cache_css_auto_publish
     test_site('zena')
     Site.connection.execute    "UPDATE sites set auto_publish = #{Zena::Db::TRUE}, redit_time = 7200 WHERE id = #{sites_id(:zena)}"
@@ -789,14 +785,15 @@ END:VCALENDAR
     login(:tiger)
     node = secure!(Node) { nodes(:style_css) }
     without_files('/test.host/public') do
-      name = "textdocument#{node.zip}.css"
-      filename = "#{SITES_ROOT}/test.host/public/en/#{name}"
+      name = 'textdocument54.11fbc.css'
+      base = "#{SITES_ROOT}/test.host/public/en"
+      filename = [base, name].join('/')
       with_caching do
         assert !File.exist?(filename)
-        get 'show', :prefix => 'en', :path => [name], :cachestamp => node.updated_at.to_i
+        get 'show', :prefix => 'en', :path => [name]
         assert_response :success
-        cache1 = make_cache_path(filename, node)
-        assert File.exist?(cache1) # cached page created
+        cache1 = filename
+        assert File.exist?(cache1), "Cache exists #{cache1}" # cached page created
         assert_match %r[body \{ background: #eee; color:#444;], File.read(cache1)
         put 'save_text', :id => nodes_zip(:style_css), :node => {'text' => '/* empty */'}
         node = assigns['node']
@@ -804,9 +801,12 @@ END:VCALENDAR
         assert_equal Zena::Status::Pub, node.version.status
         assert_equal versions_id(:style_css_en), node.version.id # auto publish
         assert !File.exist?(cache1) # old cached page removed
-        get 'show', :prefix => 'en', :path => [name], :cachestamp => node.updated_at.to_i
+        name2 = "textdocument54.#{make_cachestamp(node, nil)}.css"
+        get 'show', :prefix => 'en', :path => [name]
+        assert_redirected_to "/en/#{name2}"
+        get 'show', :prefix => 'en', :path => [name2]
         assert_response :success
-        cache2 = make_cache_path(filename, node)
+        cache2 = [base, name2].join('/')
         assert File.exist?(cache2) # cached page created again
         assert_match %r[/\* empty \*/], File.read(cache2)
       end
@@ -859,6 +859,51 @@ END:VCALENDAR
       assert_match %r{deux}, doc_versions[1].text
     end
   end
+  
+  def test_import_xhtml
+    without_files('/test.host/data') do
+      without_files('/test.host/zafu') do
+        login(:lion)
+        post 'import', :id => nodes(:skins).zip, :node => {:klass => 'Skin', :v_status => Zena::Status::Pub}, :attachment => uploaded_archive('jet_30.zip')
+        
+        node_list = assigns(:nodes)
+        nodes = {}
+        node_list.each do |n|
+          nodes[n.title] = n
+        end
+        assert skin = nodes['jet_30']
+        assert_kind_of Skin, skin
+        assert zafu = nodes['Node']
+        assert_kind_of Template, zafu
+        assert_equal 'html', zafu.format
+        assert_equal 'Node', zafu.target_klass
+        assert_equal 'N', zafu.tkpath
+        assert style = nodes['style']
+        assert_kind_of TextDocument, style
+        assert navBar = nodes['nav_bar']
+        assert_kind_of Image, navBar
+        assert xhtmlBgHover = nodes['xhtml_bg_hover']
+        assert_kind_of Image, xhtmlBgHover
+        assert topIcon = nodes['top_icon']
+        assert_kind_of Image, topIcon
+        ['lft_pic1', 'lft_pic2', 'lft_pic3'].each do |p|
+          assert nodes[p]
+          assert_kind_of Image, nodes[p]
+        end
+        assert_match %r{#header ul\{\s*background:url\('/en/image#{navBar.zip}.[0-9a-f]+.gif'\)}m, style.text
+        assert_match %r{a\.xht:hover\{\s*background:url\('/en/image#{xhtmlBgHover.zip}.[0-9a-f]+.gif'\)}, style.text
+
+        # use this template
+        status = nodes(:status)
+        status.visitor = Thread.current[:visitor]
+        assert status.update_attributes(:skin_id => skin.id, :inherit => 0)
+        get 'show', 'prefix'=>'oo', 'path'=>['projects-list', 'Clean-Water-project', "page#{status.zip}.html"]
+        assert_response :success
+
+        assert_match %r{posuere eleifend arcu</p>\s*<img [^>]*src\s*=\s*./en/image#{topIcon.zip}.[0-9a-f]+.gif}, @response.body
+      end
+    end
+  end
 
   def test_edit_attribute_publish
     login(:tiger)
@@ -970,7 +1015,7 @@ END:VCALENDAR
 
   def test_search_qb
     login(:anon)
-    get 'search', 'qb' => 'nodes where (set_tag_id = 33 and hot_id = 22) in site'
+    get 'search', 'qb' => 'projects where (set_tag.id = 33 and hot.id = 22) in site'
     assert_response :success
     assert nodes = assigns(:nodes)
     assert_equal [nodes_id(:cleanWater)], nodes.map(&:id)

data/test/functional/versions_controller_test.rb

@@ -88,8 +88,8 @@ class VersionsControllerTest < Zena::Controller::TestCase
 
     res =<<-END_CSS
     body { font-size:10px; }
-    #header { background:url('/en/image30.jpg?1144713600') }
-    #footer { background:url('/en/image31.jpg?1144713600') }
+    #header { background:url('/en/image30.11fbc.jpg') }
+    #footer { background:url('/en/image31.11fbc.jpg') }
     END_CSS
     assert_equal res, node.text
     get 'edit', :node_id => node.zip, :id => 0, :unparse_assets => 'true'

data/test/integration/navigation_test.rb

@@ -23,8 +23,7 @@ class NavigationTest < Zena::Integration::TestCase
     assert_redirected_to 'http://test.host/oo'
     follow_redirect!
     assert_response :success
-    get 'http://test.host/fr/textdocument54.css?1144713600' # data with timestamp
-    assert_response :success
+    get 'http://test.host/fr/textdocument54.11fbc.css' # data with timestamp
   end
 
   def test_should_not_redirect_to_css
@@ -54,7 +53,7 @@ class NavigationTest < Zena::Integration::TestCase
 
       subject do
         [
-          "http://localhost:1234/oo/project19.html",
+          "http://test.host:1234/oo/project19.html",
           {},
           @headers
         ]
@@ -71,7 +70,7 @@ class NavigationTest < Zena::Integration::TestCase
       context 'but invalid host' do
         subject do
           [
-            "http://test.host:1234/oo/project19.html",
+            "http://ocean.host:1234/oo/project19.html",
             {},
             @headers
           ]
@@ -82,8 +81,8 @@ class NavigationTest < Zena::Integration::TestCase
           reset!
           get *subject
           assert_response :redirect
-          assert_redirected_to 'http://test.host/login'
-          assert_equal users_id(:anon), visitor.id
+          assert_redirected_to 'http://ocean.host/login'
+          assert_equal users_id(:incognito), visitor.id
         end
       end # but invalid host
     end # with a valid http auth
@@ -103,35 +102,6 @@ class NavigationTest < Zena::Integration::TestCase
     end
   end # Rescue template rendering
 
-
-  # HTTP_AUTH disabled
-  # def test_authorize_http_auth
-  #   Site.connection.execute "UPDATE sites SET http_auth = 1 WHERE id = #{sites_id(:zena)}"
-  #   get 'http://test.host/'
-  #   assert_redirected_to 'http://test.host/en'
-  #   follow_redirect!
-  #   assert_response :success
-  #
-  #   # 1. site forces authentication
-  #   Site.connection.execute "UPDATE sites SET authentication = 1 WHERE id = #{sites_id(:zena)}"
-  #   get 'http://test.host/'
-  #   assert_response 401 # http_auth
-  #
-  #   reset!
-  #   post 'http://test.host/session', :login => 'tiger', :password => 'tiger'
-  #   assert_redirected_to "http://test.host/users/#{users_id(:tiger)}"
-  #
-  #   # 2. navigating out of '/oo' but logged in and format is not data
-  #   get 'http://test.host/fr'
-  #   assert_redirected_to 'http://test.host/oo'
-  #   follow_redirect!
-  #   assert_response :success
-  #   assert_equal 'fr', session[:lang]
-  #   get 'http://test.host/en/textdocument53.css' # data
-  #   assert_response :success
-  #   assert_equal 'fr', session[:lang]
-  # end
-
   def test_out_of_oo_custom_base_set_lang
     post 'http://test.host/session', :login => 'tiger', :password => 'tiger'
     assert_redirected_to "http://test.host/oo"
@@ -440,6 +410,62 @@ class NavigationTest < Zena::Integration::TestCase
     follow_redirect!
     assert_response :missing
   end
+  
+  def test_cache_root
+    without_files('test.host/public') do
+      preserving_files('/test.host/data') do
+        with_caching do
+          login(:anon)
+          root_path = "#{SITES_ROOT}#{visitor.site.public_path}/en.html"
+          assert !File.exists?(root_path), "No cached file yet"
+          get 'http://test.host/en'
+          assert_response :success
+          
+          # en.html exist
+          assert File.exists?(root_path), "Cached file created"
+        end
+      end
+    end
+  end
+  
+  def test_cache_query_string
+    without_files('test.host/public') do
+      preserving_files('/test.host/data') do
+        with_caching do
+          login(:anon)
+          base  = "#{SITES_ROOT}#{visitor.site.public_path}"
+          good = {
+            '/en?p=1' => '/enp=1.html',
+            '/en?p=2' => '/enp=2.html',
+            '/en?p=9' => '/enp=9.html',
+            '/en/blog29.html?p=2' => '/en/blog29.htmlp=2.html',
+          }
+          
+          bad = {
+            '/en?x=1'  => '/en.htmlx=1.html',
+            '/en?ap=2' => '/en.htmlap=2.html',
+            '/en?p=99' => '/en.htmlp=99.html',
+            '/en/blog29.html?p=21' => '/en/blog29.htmlp=21.html',
+            '/en/blog29.html?x=2'  => '/en/blog29.htmlx=2.html',
+          }
+          
+          good.each do |p, c|
+            assert !File.exists?(base + c), "No cached file #{c} yet"
+            get "http://test.host#{p}"
+            assert_response :success
+            assert File.exists?(base + c), "Cached file #{c} created"
+          end
+          
+          bad.each do |p, c|
+            assert !File.exists?(base + c), "No cached file #{c} yet"
+            get "http://test.host#{p}"
+            assert_response :success
+            assert !File.exists?(base + c), "No cached file #{c} created"
+          end
+        end
+      end
+    end
+  end
 
   def test_should_not_change_session_lang_on_login
     get 'http://test.host/'

data/test/integration/query_node/basic.yml

@@ -44,7 +44,7 @@ pages_or_letters:
   context:
     node: zena
   src: pages or letters
-  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND ((nodes.kpath LIKE 'NP%' AND nodes.parent_id = ?) OR (nodes.kpath LIKE 'NNL%' AND nodes.parent_id = ?)) GROUP BY id ORDER BY nodes.zip ASC}, @node.id, @node.id]"
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND ((nodes.kpath LIKE 'NP%' AND nodes.parent_id = ?) OR (nodes.kpath LIKE 'NNL%' AND nodes.parent_id = ?)) GROUP BY nodes.id ORDER BY nodes.zip ASC}, @node.id, @node.id]"
   res: "people, projects list, Collections, Kill the bugs, Nature, zena enhancements, Skins (layout themes)"
 
 project:
@@ -62,19 +62,19 @@ min:
 
 many_alternatives:
   src: tagged in site or images in site or tags in site
-  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.source_id AND links.relation_id = _ID(node_has_tags)) OR (nodes.kpath LIKE 'NDI%' AND links.id = 0) OR (nodes.kpath LIKE 'NPT%' AND links.id = 0)) GROUP BY nodes.id ORDER BY nodes.zip 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 JOIN nodes WHERE #{secure_scope('nodes')} AND ((nodes.id = links.source_id AND links.relation_id = _ID(node_has_tags)) OR (nodes.kpath LIKE 'NDI%' AND links.id = 0) OR (nodes.kpath LIKE 'NPT%' AND links.id = 0)) GROUP BY nodes.id ORDER BY nodes.zip ASC}"
 #  res: "art, bird, Clean Water project, flower, it's a lake, menu, news, opening, tree"
 
 alternatives_same_join:
   src: tagged in site or icons
-  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.source_id AND links.relation_id = _ID(node_has_tags)) OR (nodes.id = links.target_id AND links.relation_id = _ID(node_has_an_icon) AND links.source_id = ?)) GROUP BY nodes.id ORDER BY nodes.zip 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 JOIN nodes WHERE #{secure_scope('nodes')} AND ((nodes.id = links.source_id AND links.relation_id = _ID(node_has_tags)) OR (nodes.id = links.target_id AND links.relation_id = _ID(node_has_an_icon) AND links.source_id = ?)) GROUP BY nodes.id ORDER BY nodes.zip ASC}, @node.id]"
   res: "Clean Water project, it's a lake, super ouverture"
 
 same_name_as_class:
   context:
     node: 'opening'
   src: "set_tags"
-  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_tags) AND links.source_id = ? ORDER BY nodes.zip 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 JOIN nodes WHERE #{secure_scope('nodes')} AND nodes.id = links.target_id AND links.relation_id = _ID(node_has_tags) AND links.source_id = ? ORDER BY nodes.zip ASC}, @node.id]"
   res: "Art, News list"
 
 
@@ -109,19 +109,19 @@ children_with_order_clause:
 notes_or_news:
   context:
     class: Project
-  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.kpath LIKE 'NN%' AND nodes.parent_id = ? AND links.id = 0) OR (nodes.id = links.source_id AND links.relation_id = _ID(note_has_calendars) AND links.target_id = ?)) GROUP BY nodes.id ORDER BY nodes.zip 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 JOIN nodes WHERE #{secure_scope('nodes')} AND ((nodes.kpath LIKE 'NN%' AND nodes.parent_id = ? AND links.id = 0) OR (nodes.id = links.source_id AND links.relation_id = _ID(note_has_calendars) AND links.target_id = ?)) GROUP BY nodes.id ORDER BY nodes.zip ASC}, @node.id, @node.id]"
 
 news_or_notes:
   context:
     class: Project
-  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.source_id AND links.relation_id = _ID(note_has_calendars) AND links.target_id = ?) OR (nodes.kpath LIKE 'NN%' AND nodes.parent_id = ? AND links.id = 0)) GROUP BY nodes.id ORDER BY nodes.zip 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 JOIN nodes WHERE #{secure_scope('nodes')} AND ((nodes.id = links.source_id AND links.relation_id = _ID(note_has_calendars) AND links.target_id = ?) OR (nodes.kpath LIKE 'NN%' AND nodes.parent_id = ? AND links.id = 0)) GROUP BY nodes.id ORDER BY nodes.zip ASC}, @node.id, @node.id]"
 
 order_l_status:
   context:
     node:  art
     class: Tag
   src: "tagged order by l_status ASC, zip 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 WHERE #{secure_scope('nodes')} AND nodes.id = links.source_id AND links.relation_id = _ID(node_has_tags) AND links.target_id = ? ORDER BY links.status ASC, nodes.zip 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 JOIN nodes WHERE #{secure_scope('nodes')} AND nodes.id = links.source_id AND links.relation_id = _ID(node_has_tags) AND links.target_id = ? ORDER BY links.status ASC, nodes.zip ASC}, @node.id]"
   res: "super ouverture, Clean Water project"
 
 order_random:

data/test/integration/query_node/comments.yml

@@ -9,7 +9,7 @@ default:
 comments_from_nodes_in_site:
   context:
     visitor: lion
-  sql: "Comment: %Q{SELECT comments.* FROM comments,discussions,nodes AS no1 WHERE comments.discussion_id = discussions.id AND discussions.node_id = no1.id AND #{secure_scope('no1')} GROUP BY comments.id ORDER BY comments.created_at ASC}"
+  sql: "Comment: %Q{SELECT comments.* FROM comments JOIN discussions JOIN nodes AS no1 WHERE comments.discussion_id = discussions.id AND discussions.node_id = no1.id AND #{secure_scope('no1')} GROUP BY comments.id ORDER BY comments.created_at ASC}"
   res: "Comment: I agree, I think this is bad, OK for me, Why ?, Travailleurs, unissez-vous !, Nice site, What about rivers ?, re: What about rivers ?, I want to become queen"
 
 does_not_see_secret:

data/test/integration/query_node/complex.yml

@@ -49,7 +49,7 @@ all_courses_for_mike:
     class: Employee
   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}]"
+  #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 JOIN nodes JOIN 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: "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:
@@ -63,8 +63,8 @@ custom_query_form_date:
   context:
     node: roger
     class: Employee
-  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"
+  src: det_programs order by title ASC
+  res: ""
 
 custom_query_form_with_where:
   context:

data/test/integration/query_node/filters.yml

@@ -27,7 +27,7 @@ filter_l_status:
     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.zip 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 JOIN 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:
@@ -79,8 +79,8 @@ negative_value:
   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/"
+  src: "projects where (set_tag.id = 33 and hot.id = 22) in site"
+  sql: "/.*li1.source_id = nodes.id.*li2.source_id = nodes.id.*jn1\.zip = 33 AND jn2\.zip = 22/"
   res: "Clean Water project"
 
 filter_with_fullpath:
@@ -91,7 +91,7 @@ filter_with_fullpath:
 
 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.zip ASC}"
+  sql: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND (nodes.kpath LIKE 'NDI%' OR nodes.kpath = 'NPP') GROUP BY nodes.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:
@@ -104,7 +104,7 @@ 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.zip ASC}"
+  sql: "%Q{SELECT nodes.* FROM nodes JOIN 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:
@@ -113,13 +113,37 @@ 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.zip ASC}"
+  sql: "%Q{SELECT nodes.* FROM nodes JOIN 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'
 
+relation_filter:
+  context:
+    node: status
+    params:
+      list: 22
+  src: "projects where hot.id in (#{params[:list]}) in site"
+  sql: "[%Q{SELECT nodes.* FROM nodes LEFT JOIN links AS li1 ON li1.source_id = nodes.id AND li1.relation_id = 126629661 LEFT JOIN nodes AS jn1 ON jn1.id = li1.target_id WHERE #{secure_scope('nodes')} AND jn1.zip IN (?) AND nodes.kpath LIKE 'NPP%' GROUP BY nodes.id ORDER BY nodes.zip ASC}, params[:list]]"
+  res: "Clean Water project"
+
+relation_filter_null:
+  context:
+    node: status
+  src: "projects where hot.id is null in site"
+  sql: "%Q{SELECT nodes.* FROM nodes LEFT JOIN links AS li1 ON li1.source_id = nodes.id AND li1.relation_id = 126629661 LEFT JOIN nodes AS jn1 ON jn1.id = li1.target_id WHERE #{secure_scope('nodes')} AND jn1.zip IS NULL AND nodes.kpath LIKE 'NPP%' GROUP BY nodes.id ORDER BY nodes.zip ASC}"
+  # NOT CleanWater
+  res: "Zena the wild CMS, a wiki with Zena"
+
+relation_filter_attr:
+  context:
+    node: status
+  src: "projects where hot.title = 'Etat des travaux' in site"
+  sql: "/ON ml1.node_id = jn1.id AND ml1.key = 'title' AND ml1.lang = 'fr'.*ml1.value = 'Etat des travaux'/"
+  res: "Clean Water project"
+  
 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.zip ASC}"
+  sql: "%Q{SELECT nodes.* FROM nodes LEFT JOIN nodes AS jn1 ON jn1.id = nodes.parent_id AND jn1.site_id = nodes.site_id WHERE #{secure_scope('nodes')} AND jn1.zip = 11 ORDER BY nodes.zip ASC}"
   res: 'people, projects list, Collections, Kill the bugs, Nature, zena enhancements, Skins (layout themes)'
 #many_role_filter:
 # This is not working (or clause on 'indexed' fields is not supported right now)
@@ -129,7 +153,7 @@ filter_by_parent:
 
 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}"
+  sql: "%Q{SELECT nodes.* FROM nodes LEFT JOIN links AS ta1 ON nodes.id = ta1.source_id AND ta1.relation_id IS NULL WHERE #{secure_scope('nodes')} AND ta1.comment = '10\\\\'000' ORDER BY nodes.zip ASC}"
   res: ''
 # filters on ml strings are in properties.yml
 

data/test/integration/query_node/idx_key_value.yml

@@ -6,17 +6,17 @@ default:
 
 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}"
+  sql: "%Q{SELECT nodes.* FROM nodes LEFT JOIN idx_nodes_ml_strings AS ml1 ON ml1.node_id = nodes.id AND ml1.key = 'title' AND ml1.lang = 'fr' WHERE #{secure_scope('nodes')} AND ml1.value LIKE 'Etat%' 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}"
+  sql: "%Q{SELECT nodes.* FROM nodes LEFT JOIN idx_nodes_ml_strings AS ml1 ON ml1.node_id = nodes.id AND ml1.key = 'title' AND ml1.lang = 'fr' WHERE #{secure_scope('nodes')} AND (ml1.value LIKE 'Etat%' OR nodes.kpath = 'NNL') 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}"
+  sql: "%Q{SELECT nodes.* FROM nodes LEFT JOIN idx_nodes_strings AS st1 ON st1.node_id = nodes.id AND st1.key = 'name' WHERE #{secure_scope('nodes')} AND st1.value LIKE 'Inv%' AND nodes.kpath LIKE 'NRC%' ORDER BY nodes.zip ASC}"
   res: 'Solenopsis Invicta'
 
 # TODO: Only implement with a proper use case. Ref [#190]
@@ -31,13 +31,13 @@ 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}"
+  sql: "%Q{SELECT nodes.* FROM nodes LEFT JOIN idx_nodes_ml_strings AS ml1 ON ml1.node_id = nodes.id AND ml1.key = 'title' AND ml1.lang = 'fr' WHERE #{secure_scope('nodes')} 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 = \?/"
+  sql: "/idx_nodes_ml_strings AS ml1.*key = 'title'.*lang = 'fr'.*ml1.value = 'important'.*nodes.id = links.target_id.*source_id = \?/"
   res: ""
 
 
@@ -45,19 +45,19 @@ 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}"
+  sql: "%Q{SELECT nodes.* FROM nodes LEFT JOIN idx_nodes_ml_strings AS ml1 ON ml1.node_id = nodes.id AND ml1.key = 'title' AND ml1.lang = 'fr' WHERE #{secure_scope('nodes')} AND ml1.value = 'foo' 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}"
+  sql: "%Q{SELECT nodes.* FROM nodes LEFT JOIN idx_nodes_ml_strings AS ml1 ON ml1.node_id = nodes.id AND ml1.key = 'title' AND ml1.lang = 'fr' WHERE #{secure_scope('nodes')} AND ml1.value = 'foo' 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}"
+  sql: "%Q{SELECT nodes.* FROM nodes LEFT JOIN idx_nodes_ml_strings AS ml1 ON ml1.node_id = nodes.id AND ml1.key = 'title' AND ml1.lang = 'fr' WHERE #{secure_scope('nodes')} AND ml1.value = 'foo' AND ml1.value = 'baz' ORDER BY nodes.zip ASC}"
 
   
 ml_title_with_name:
@@ -67,11 +67,11 @@ ml_title_with_name:
   
 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/"
+  sql: "/ml1.*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}"
+  sql: "%Q{SELECT nodes.* FROM nodes LEFT JOIN idx_nodes_ml_strings AS ml1 ON ml1.node_id = nodes.id AND ml1.key = 'title' AND ml1.lang = 'fr' WHERE #{secure_scope('nodes')} 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"