lib/pseudo_sql_parser.rb lib/pseudo_sql_parser.rl @@ -1,6 +1,6 @@ = QueryBuilder -* http://github.com/zena/querybuilder/tree/master +* http://zenadmin.org/524 == DESCRIPTION: README.rdoc @@ -1,6 +1,7 @@ $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__))) +require 'pseudo_sql_parser' require 'yaml' =begin rdoc @@ -219,7 +220,6 @@ class QueryBuilder end def parse_part(part, is_last) - rest, context = part.split(' in ') clause, filters = rest.split(/\s+where\s+/) lib/QueryBuilder.rb @@ -1,11 +1,14 @@ empty: src: "" + sxp: "[:query]" res: "[\"SELECT objects.* FROM objects WHERE objects.parent_id = ?\", id]" objects: + sxp: '[:query, [:relation, "objects"]]' res: "[\"SELECT objects.* FROM objects WHERE objects.parent_id = ?\", id]" objects_in_project: + sxp: '[:query, [:scope, [:relation, "objects"], "project"]]' res: "[\"SELECT objects.* FROM objects WHERE objects.project_id = ?\", project_id]" objects_in_site: test/QueryBuilder/basic.yml @@ -1,5 +1,6 @@ simple: src: "objects where name = 'foo' in site" + sxp: '[:query, [:scope, [:filter, [:relation, "objects"], [:"=", [:field, "name"], [:string, "foo"]]], "site"]]' res: "[\"SELECT objects.* FROM objects WHERE objects.name = ?\", \"foo\"]" recipients_that_are_clients: @@ -28,6 +29,7 @@ custom_query_having: equation_in_filter: src: "objects where event_at > REF_DATE + custom_a months" + sxp: '[:query, [:filter, [:relation, "objects"], [:>, [:field, "event_at"], [:+, [:field, "REF_DATE"], [:field, "custom_a"]]]]]' res: "[\"SELECT objects.* FROM objects WHERE objects.parent_id = ? AND objects.event_at > now() + INTERVAL objects.custom_a MONTH\", id]" equation_in_filter_date: test/QueryBuilder/filters.yml @@ -1,7 +1,11 @@ icons_from_recipients: + sxp: '[:query, [:from, [:relation, "icons"], [:relation, "recipients"]]]' res: "[\"SELECT ob1.* FROM objects,links,objects AS ob1,links AS li1 WHERE ob1.id = li1.source_id AND li1.relation_id = 5 AND li1.target_id = objects.id AND objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ? GROUP BY ob1.id\", id]" +icons_from_recipients_from_letters: + sxp: '[:query, [:from, [:relation, "icons"], [:from, [:relation, "recipients"], [:relation, "letters"]]]]' + letters_from_recipients: res: "[\"SELECT ob1.* FROM objects,links,objects AS ob1 WHERE ob1.kpath LIKE 'NNL%' AND ob1.parent_id = objects.id AND objects.id = links.target_id AND links.relation_id = 4 AND links.source_id = ? GROUP BY ob1.id\", id]" test/QueryBuilder/joins.yml @@ -21,6 +21,9 @@ class DummyQueryBuilder < Test::Unit::TestCase else query.errors.join(", ") end + when 'sxp' + # s-expression + PseudoSQLParser.parse(source).inspect when 'sql' query.sql(binding) when 'count' test/test_QueryBuilder.rb @@ -1,6 +1,7 @@ require 'stringio' require 'test/unit' require File.dirname(__FILE__) + '/../lib/QueryBuilder' +require File.dirname(__FILE__) + '/../lib/pseudo_sql_parser' require File.dirname(__FILE__) + '/mock/dummy_query' require File.dirname(__FILE__) + '/mock/user_query' require 'rubygems' test/test_helper.rb dce150a7cf1137a5b260c4922de0422f0465145c Gaspard Bucher gaspard@teti.ch http://github.com/zena/querybuilder/commit/6771494b043c38bd1e241c8451cf6026ae382177 6771494b043c38bd1e241c8451cf6026ae382177 2009-06-06T08:00:08-07:00 2009-06-06T08:00:08-07:00 Started to change the pseudo_sql compilation into a two step process (s-expression compilation with ragel + compilation) in order to enable better query introspection. e703707703f81ab60a3a2150d49684231d6b8228 Gaspard Bucher gaspard@teti.ch