Rubernate 0.1.3 → 0.1.4

data/lib/rubernate/queries.rb

@@ -249,7 +249,8 @@ module Queries
       
       # Init Param accepts table and name of param
       def initialize factory, r_object, name
-        @factory, @r_object, @name, @r_params = factory, r_object, name, [self]
+        @factory, @r_object, @name = factory, r_object, name
+        @marker, @r_params = [], [self]
       end
       
       # Returns full param table name with object tables prefix 
@@ -368,8 +369,8 @@ module Queries
       
       # Returns markers used in query in valid order.
       def markers
-        to_sql unless @sql
-        @markers ||= @exprs.inject([]){|result, expr| result.concat expr.markers}
+        to_sql
+        @markers
       end
       
       # Arranges map: values {marker=>value} to ordered array of values 
@@ -384,12 +385,11 @@ module Queries
         if @query.is_a? String
           @sql, @markers = @factory.cache[@query]       
           unless @sql
-            @sql = eval_query
-            @markers = @exprs.inject([]){|result, expr| result.concat expr.markers}
+            @sql, @markers = eval_query
             @factory.cache[@query] = [@sql, @markers]
           end
         else
-          @sql = eval_query
+          @sql, @markers = eval_query
         end
         @sql
       end
@@ -402,7 +402,7 @@ module Queries
           Log.debug "Translate: <<#{query}>> to sql: <<#{sql}>>"
         end
         
-        # Evaluates query withing the object context.
+        # Evaluates query withing the object context. Returns sql, and array of markers: [sql, [m1,m2,..]]
         def eval_query
           if @query.is_a? Proc
             instance_eval(&@query)
@@ -413,7 +413,7 @@ module Queries
           sql+= "\n\twhere #{where_sql}"
           sql+= "\n\torder by #{order_by_sql}" unless @order.empty?
           log_debug_query sql
-          sql
+          [sql, @exprs.inject([]){|result, expr| result.concat expr.markers}]
         end
 
         # Generates where clause for each expression joined by and clause
@@ -429,11 +429,19 @@ module Queries
         
         # Generates left outer join for each r_params used in query
         def tables_sql
-          r_objects.collect{|r_object| 'r_objects ' + r_object.to_sql}.join(', ') + 
-            r_params.collect{|r_param| 
-                  "\n\tleft outer join r_params " + r_param.to_sql + 
-                  ' on (' + r_param.r_object.to_sql + '.object_pk = ' + r_param.to_sql + '.object_pk)'
-          }.join()
+          r_joins = {}
+          r_objects.each{|r_o| r_joins[r_o.to_sql] ||= []} # Collect all r_objects used in query
+          r_params.each{|r_p| r_joins[r_p.r_object.to_sql] << r_p.to_sql} #Join all r_params to r_objects          
+                    
+          result = nil
+          for obj, params in r_joins
+            result = result ? result << ",\n\t\t" : ''
+            result << 'r_objects ' + obj
+            for param in params
+              result << " left outer join r_params #{param} on (#{obj}.object_pk = #{param}.object_pk)"
+            end
+          end
+          result
         end      
         
         # Retruns r_params used in query. List of RParam.

data/tests/all_tests.rb

@@ -8,5 +8,13 @@ require 'rubernate/utils_test'
 require 'rubernate/queries_test'
 require 'rubernate/impl/memory_test'
 require 'rubernate/callbacks_test'
-require 'rubernate/impl/dbi_oracle_test' if $run_oracle_tests
-require 'rubernate/impl/dbi_mysql_test'  if $run_mysql_tests
+
+if $run_oracle_tests
+  require 'rubernate/impl/queries_oracle_test' 
+  require 'rubernate/impl/dbi_oracle_test' 
+end
+
+if $run_mysql_tests
+  require 'rubernate/impl/queries_mysql_test' 
+  require 'rubernate/impl/dbi_mysql_test' 
+end

data/tests/rubernate/fixtures.rb

@@ -8,16 +8,24 @@ require 'test/unit'
 
 module FixtureClasses
   class C0; attr :p0, false end
-  class C1; persistent :p1; end
+  class C1
+    persistent :p1
+    def to_s
+      "#{self.class}:#{primary_key}"
+    end
+  end
   class C2 < C1; persistent :p2; end
-  class C3 < C0; 
+  class C3 < C0 
     persistent :p0
     def on_load
       Thread.current[:on_load] = self
     end
     def on_save
       Thread.current[:on_save] = self
-    end        
+    end
+    def to_s
+      "#{self.class}:#{primary_key}"
+    end
   end
   class C4 < C2
     def initialize pk = nil 
@@ -26,5 +34,8 @@ module FixtureClasses
   end
   class Full
     persistent :p_nil, :p_int, :p_float, :p_str, :p_date, :p_time, :p_array, :p_hash
+    def to_s
+      "#{self.class}:#{primary_key}"
+    end
   end
 end

data/tests/rubernate/impl/queries_mysql_test.rb

@@ -0,0 +1,15 @@
+$:.unshift(File.expand_path('../../..', __FILE__)) unless 
+  $:.include?(File.expand_path('../../..', __FILE__))
+
+require 'rubernate/fixtures' 
+require 'rubernate/impl/queries_stub'
+
+module Rubernate
+  class MysqlQueriesTest < Test::Unit::TestCase
+    include GenericQueriesTest
+    def setup
+      init :mysql, MYSQL_DB_URL, MYSQL_DB_USER, MYSQL_DB_PWD
+    end  
+  end
+end  
+

data/tests/rubernate/impl/queries_oracle_test.rb

@@ -0,0 +1,16 @@
+
+$:.unshift(File.expand_path('../../..', __FILE__)) unless 
+  $:.include?(File.expand_path('../../..', __FILE__))
+
+require 'rubernate/fixtures' 
+require 'rubernate/impl/queries_stub'
+
+module Rubernate
+  class OracleQueriesTest < Test::Unit::TestCase
+    include GenericQueriesTest
+    def setup
+      init :oracle, ORA_DB_URL, ORA_DB_USER, ORA_DB_PWD
+    end  
+  end
+end  
+

data/tests/rubernate/impl/queries_stub.rb

@@ -0,0 +1,72 @@
+$:.unshift(File.expand_path('../../..', __FILE__)) unless 
+  $:.include?(File.expand_path('../../..', __FILE__))
+
+require 'config'
+require 'rubernate/fixtures' 
+
+module Rubernate
+module GenericQueriesTest
+  include Rubernate
+  include FixtureClasses
+  
+  def init db_type, db_url, db_user, db_password
+    Rubernate.config db_type, db_url, db_user, db_password
+    Rubernate.session do |rt|
+      rt.dbh.do 'delete from r_params'
+      rt.dbh.do 'delete from r_objects'
+    end
+  end
+
+  def teardown
+    @runtime.dbh.disconnect if @runtime and @runtime.dbh
+  end  
+  
+  def test_find_by_param_value
+    Rubernate.session do
+      o = C1.new.attach
+      # Test string value
+      o.p1 = 'tv1'
+      res = find_by_query 'Select :o; Where o.p1.str == :value', :value => 'tv1'
+      assert_equal [o], res
+      # Test int value
+      o.p1 = 123
+      res = find_by_query 'Select :o; Where o.p1.int == :value', :value => 123
+      assert_equal [o], res
+      # Test date value
+      date = Date.today
+      o.p1 = date
+      res = find_by_query 'Select :o; Where o.p1.date == :value', :value => date
+      assert_equal [o], res
+      # Test time value 
+      time = Time.now
+      o.p1 = time
+      res = find_by_query 'Select :o; Where o.p1.time == :value', :value => time
+      assert_equal [o], res      
+      # Test ref value
+      o.p1 = o
+      res = find_by_query 'Select :o; Where o.p1.ref == :value', :value => o
+      assert_equal [o], res
+    end
+  end
+  
+  def test_eq_two_props
+    Rubernate.session do
+      o1, o2 = C2.new.attach, C2.new.attach
+      o1.p1, o1.p2 = 1, 2
+      o2.p1, o2.p2 = 3, 3
+      res = find_by_query 'Select :o; Where o.p1.int == o.p2.int, o.p2.int >= 2'
+      assert_equal [o2], res      
+    end
+  end
+  
+  def test_ref_on_other
+    Rubernate.session do
+      o1, o2 = C2.new.attach, C2.new.attach
+      o1.p1 = o2
+      o2.p1 = 'test'
+      res = find_by_query 'Select :o1, :o2; Where o1.p1.ref == o2, o2.p1.str == :v', :v => 'test'
+      assert_equal [o1], res
+    end
+  end
+end  
+end

data/tests/rubernate/queries_test.rb

@@ -3,174 +3,187 @@ $:.unshift(File.expand_path('../..', __FILE__)) unless
 
 require 'rubernate/fixtures'
 
-class Rubernate::QueriesGenericTest < Test::Unit::TestCase
-  include Rubernate::Queries
-  include FixtureClasses
-  
-  def setup
-    @factory = Factory.new
-  end
-  
-  def query *q_text, &q_block
-    if block_given?
-      @factory.query(&q_block)
-    else
-      @factory.query q_text[0]
+module Rubernate
+  class QueryBuildTest < Test::Unit::TestCase
+    include Rubernate::Queries
+    include FixtureClasses
+    
+    def setup
+      @factory = Factory.new
     end
-  end
     
-  def once str, substr
-    lidx, ridx = str.index(substr), str.rindex(substr)
-    lidx and lidx == ridx
-  end
+    def query *q_text, &q_block
+      if block_given?
+        @factory.query(&q_block)
+      else
+        @factory.query q_text[0]
+      end
+    end
+      
+    def once str, substr
+      lidx, ridx = str.index(substr), str.rindex(substr)
+      lidx and lidx == ridx
+    end
 
-  def assert_once string, tokens
-    tokens = [tokens] unless tokens.is_a? Array
-    for token in tokens
-      assert once(string, token), "'#{token}' must occurse only once in \n'#{string}'"
+    def assert_once string, tokens
+      tokens = [tokens] unless tokens.is_a? Array
+      for token in tokens
+        assert once(string, token), "'#{token}' must occurse only once in \n'#{string}'"
+      end
+    end
+    
+    def test_query_simplest
+      q = query 'Select :o; Where o.p1.int == 1'
+      sql = q.to_sql.downcase
+      assert_once sql, [ 'select o_.* from', 'r_objects o_', 'r_params o_p1', 
+          'o_.object_pk = o_p1.object_pk', 'o_p1.name = \'p1\'']
+    end
+       
+    def test_query_join_by_int
+      q = query "Select :o, :p; Where(o.p1.int == p.p2.int)"
+      sql = q.to_sql.downcase
+      assert_once sql, [ 'r_objects p_', 'r_params p_p2', 'r_objects o_', 'r_params o_p1',
+        'o_.object_pk = o_p1.object_pk', 'p_.object_pk = p_p2.object_pk',
+        'o_p1.int_value = p_p2.int_value', 'o_p1.name = \'p1\'',
+        'p_p2.name = \'p2\'' ]
+    end
+    
+    def test_query_filter_by_int
+      q = query {Select :o; Where(o.p1.int == 1)}
+      sql = q.to_sql.downcase        
+      assert_once sql, ['o_p1.int_value = 1', 'o_p1.name = \'p1\'']
     end
-  end
-  
-  def test_query_simplest
-    q = query 'Select :o; Where o.p1.int == 1'
-    sql = q.to_sql.downcase
-    assert_once sql, [ 'select o_.* from', 'r_objects o_', 'r_params o_p1', 
-        'o_.object_pk = o_p1.object_pk', 'o_p1.name = \'p1\'']
-  end
-     
-  def test_query_join_by_int
-    q = query "Select :o, :p; Where(o.p1.int == p.p2.int)"
-    sql = q.to_sql.downcase
-    assert_once sql, [ 'r_objects p_', 'r_params p_p2', 'r_objects o_', 'r_params o_p1',
-      'o_.object_pk = o_p1.object_pk', 'p_.object_pk = p_p2.object_pk',
-      'o_p1.int_value = p_p2.int_value', 'o_p1.name = \'p1\'',
-      'p_p2.name = \'p2\'' ]
-  end
-  
-  def test_query_filter_by_int
-    q = query {Select :o; Where(o.p1.int == 1)}
-    sql = q.to_sql.downcase        
-    assert_once sql, ['o_p1.int_value = 1', 'o_p1.name = \'p1\'']
-  end
 
-  def test_query_filter_by_nil
-    q = query 'Select :o; Where(o.p1.int.is_nil)'
-    sql = q.to_sql.downcase
-    assert_once sql, ['o_p1.int_value is null', 'o_p1.name = \'p1\'']
-    q = query 'Select :o; Where(o.p1.int.is_not_nil)'
-    sql = q.to_sql.downcase
-    assert_once sql, ['o_p1.int_value is not null']
-  end
-  
-  def test_query_and
-    q = query 'Select :o; Where And(o.p1.int == 1, o.p2.int == 2)'
-    sql = q.to_sql.downcase
-    assert_once sql, ['o_p1.int_value = 1', 'o_.object_pk = o_p2.object_pk']
-  end
+    def test_query_filter_by_nil
+      q = query 'Select :o; Where(o.p1.int.is_nil)'
+      sql = q.to_sql.downcase
+      assert_once sql, ['o_p1.int_value is null', 'o_p1.name = \'p1\'']
+      q = query 'Select :o; Where(o.p1.int.is_not_nil)'
+      sql = q.to_sql.downcase
+      assert_once sql, ['o_p1.int_value is not null']
+    end
+    
+    def test_query_and
+      q = query 'Select :o; Where And(o.p1.int == 1, o.p2.int == 2)'
+      sql = q.to_sql.downcase
+      assert_once sql, ['o_p1.int_value = 1', 'o_.object_pk = o_p2.object_pk']
+    end
 
-  def test_query_less_greater
-    q = query 'Select :o; Where And(o.p1.int < 1, o.p2.int > 2)'
-    sql = q.to_sql.downcase
-    assert_once sql, ['o_p1.int_value < 1', 'o_p2.int_value > 2']
-  end
+    def test_query_less_greater
+      q = query 'Select :o; Where And(o.p1.int < 1, o.p2.int > 2)'
+      sql = q.to_sql.downcase
+      assert_once sql, ['o_p1.int_value < 1', 'o_p2.int_value > 2']
+    end
 
-  def test_query_or
-    q = query 'Select :o; Where (Or o.p1.int == 1, o.p2.int == 2)'
-    sql = q.to_sql.downcase
-    assert_once sql, ['o_p1.int_value = 1', 'o_p1.int_value = 1', 'or']  
-  end
-  
-  def test_query_and_or
-    q = query 'Select :o; Where Or((And o.p1.int == 1, o.p2.int == 2), (o.p1.int == 3))'
-    sql = q.to_sql.downcase      
-    assert_once sql, ['o_p1.int_value = 1', 'o_p2.int_value = 2', 'o_p1.int_value = 3', 'or']
-  end
-  
-  def test_query_ref_equality
-    q = query 'Select :o, :t; Where Or(o.p1 == t, t.p2.int > 10)'
-    sql = q.to_sql.downcase
-    assert_once sql, 'o_p1.ref_value = t_.object_pk'
-  end
-  
-  def test_query_is_int
-    q = query {Select :o; Where o.p1.is_int}
-    sql = q.to_sql.downcase
-    assert_once sql, 'o_p1.flags = 1'
-  end
-  
-  def test_array_index
-    q = query {Select :o, :t; Where(o.p[3] == t)}
-    sql = q.to_sql.downcase
-    assert_once sql, ['o_.object_pk = o_p.object_pk', 'o_p.int_value = 3', 
-      'o_p.ref_value = t_.object_pk']
-  end
+    def test_query_or
+      q = query 'Select :o; Where (Or o.p1.int == 1, o.p2.int == 2)'
+      sql = q.to_sql.downcase
+      assert_once sql, ['o_p1.int_value = 1', 'o_p1.int_value = 1', 'or']  
+    end
+    
+    def test_query_and_or
+      q = query 'Select :o; Where Or((And o.p1.int == 1, o.p2.int == 2), (o.p1.int == 3))'
+      sql = q.to_sql.downcase      
+      assert_once sql, ['o_p1.int_value = 1', 'o_p2.int_value = 2', 'o_p1.int_value = 3', 'or']
+    end
+    
+    def test_query_ref_equality
+      q = query 'Select :o, :t; Where Or(o.p1 == t, t.p2.int > 10)'
+      sql = q.to_sql.downcase
+      assert_once sql, 'o_p1.ref_value = t_.object_pk'
+    end
+    
+    def test_query_is_int
+      q = query {Select :o; Where o.p1.is_int}
+      sql = q.to_sql.downcase
+      assert_once sql, 'o_p1.flags = 1'
+    end
+    
+    def test_array_index
+      q = query {Select :o, :t; Where(o.p[3] == t)}
+      sql = q.to_sql.downcase
+      assert_once sql, ['o_.object_pk = o_p.object_pk', 'o_p.int_value = 3', 
+        'o_p.ref_value = t_.object_pk']
+    end
 
-  def test_array_param_index
-    q = query {Select :o, :t; Where(o.p[:index] == t)}
-    sql = q.to_sql.downcase
-    assert_once sql, ['o_.object_pk = o_p.object_pk', 'o_p.int_value = ?', 
-      'o_p.ref_value = t_.object_pk']
-  end
-  
-  def test_not_expr
-    q = query {Select :o; Where(Not(o.p.int == 1))}
-    sql = q.to_sql.downcase
-    assert_once sql, 'not (o_p.int_value = 1)'
-  end
-  
-  def test_markers
-    q = query {Select :o; Where(o.p1.int == :v1, o.p2 == :r2)}
-    sql = q.to_sql.downcase
-    assert_once sql, ['o_p1.int_value = ?', 'o_p2.ref_value = ?']
-    assert_equal [:v1, :r2], q.markers
-  end  
-  
-  def test_no_markers
-    q = query {Select :o; Where(o.p1.int == 1)}
-    assert_equal [], q.markers
-  end
-  
-  def test_class_equal
-    q = query {Select :o; Where(o.klass == C1)}
-    sql = q.to_sql
-    assert_once sql, ['r_objects o', 'o_.object_class = \'FixtureClasses::C1\'']  
-  end
-  
-  def test_expr_in
-    q = query {Select :o; Where(In(o.p1.int, [1, 2, 3]))}
-    sql = q.to_sql.downcase
-    assert_once sql, 'o_p1.int_value in (1, 2, 3)'
-  end
-  
-  def test_order_by
-    q = query {Select :o; Where o.klass == C1; OrderBy o.p1.int}
-    sql = q.to_sql.downcase
-    assert_once sql, 'order by o_p1.int_value'
-  end
-  
-  def test_in_subclasses
-    q = query 'Select :o; Where In(o.klass, FixtureClasses::C1.subclasses)'
-    assert_once q.to_sql, %w{o_.object_class FixtureClasses::C2 FixtureClasses::C4}
-  end
-  
-  def test_derived
-    q = query 'Select :o; Where o.derived(FixtureClasses::C1)'
-    q.to_sql
-    assert_once q.to_sql, %w{FixtureClasses::C1 FixtureClasses::C2 FixtureClasses::C4}
-    
-    q = query 'Select :o; Where o.derived(FixtureClasses::C4)'
-    assert_once q.to_sql, %w{FixtureClasses::C4}
-  end
-  
-  def test_param_name
-    q = query {Select :o; Where o.name.str == :name}
-    assert_once q.to_sql, ["o_name.name = 'name'", 'o_name.str_value = ?']
+    def test_array_param_index
+      q = query {Select :o, :t; Where(o.p[:index] == t)}
+      sql = q.to_sql.downcase
+      assert_once sql, ['o_.object_pk = o_p.object_pk', 'o_p.int_value = ?', 
+        'o_p.ref_value = t_.object_pk']
+    end
+    
+    def test_not_expr
+      q = query {Select :o; Where(Not(o.p.int == 1))}
+      sql = q.to_sql.downcase
+      assert_once sql, 'not (o_p.int_value = 1)'
+    end
+    
+    def test_markers
+      q = query {Select :o; Where(o.p1.int == :v1, o.p2 == :r2)}
+      sql = q.to_sql.downcase
+      assert_once sql, ['o_p1.int_value = ?', 'o_p2.ref_value = ?']
+      assert_equal [:v1, :r2], q.markers
+    end  
+    
+    def test_no_markers
+      q = query {Select :o; Where(o.p1.int == 1)}
+      assert_equal [], q.markers
+    end
+    
+    def test_class_equal
+      q = query {Select :o; Where(o.klass == C1)}
+      sql = q.to_sql
+      assert_once sql, ['r_objects o', 'o_.object_class = \'FixtureClasses::C1\'']  
+    end
+    
+    def test_expr_in
+      q = query {Select :o; Where(In(o.p1.int, [1, 2, 3]))}
+      sql = q.to_sql.downcase
+      assert_once sql, 'o_p1.int_value in (1, 2, 3)'
+    end
+    
+    def test_order_by
+      q = query {Select :o; Where o.klass == C1; OrderBy o.p1.int}
+      sql = q.to_sql.downcase
+      assert_once sql, 'order by o_p1.int_value'
+    end
+    
+    def test_in_subclasses
+      q = query 'Select :o; Where In(o.klass, FixtureClasses::C1.subclasses)'
+      assert_once q.to_sql, %w{o_.object_class FixtureClasses::C2 FixtureClasses::C4}
+    end
+    
+    def test_derived
+      q = query 'Select :o; Where o.derived(FixtureClasses::C1)'
+      q.to_sql
+      assert_once q.to_sql, %w{FixtureClasses::C1 FixtureClasses::C2 FixtureClasses::C4}
+      
+      q = query 'Select :o; Where o.derived(FixtureClasses::C4)'
+      assert_once q.to_sql, %w{FixtureClasses::C4}
+    end
+    
+    def test_param_name
+      q = query {Select :o; Where o.name.str == :name}
+      assert_once q.to_sql, ["o_name.name = 'name'", 'o_name.str_value = ?']
+    end
+    
+    def test_eq_equivalence
+      q0 = query {Select :o; Where o.p1 == :ref}
+      q1 = query {Select :o; Where Eq(o.p1, :ref)}
+      assert_equal q0.to_sql, q1.to_sql
+      assert_equal q0.markers, q1.markers
+    end
+
+    def test_cache
+      q = query 'Select :o; Where o.p1.int == 1'
+      sql = q.to_sql
+      mrk = q.markers
+      10.times do
+        q = query 'Select :o; Where o.p1.int == 1'
+        assert_equal sql, q.to_sql
+        assert_equal mrk, q.markers      
+      end
+    end
   end
-  
-  def test_eq_equivalence
-    q0 = query {Select :o; Where o.p1 == :ref}
-    q1 = query {Select :o; Where Eq(o.p1, :ref)}
-    assert_equal q0.to_sql, q1.to_sql
-    assert_equal q0.markers, q1.markers
-  end  
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: Rubernate
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
-date: 2006-03-13 00:00:00 +03:00
+  version: 0.1.4
+date: 2006-03-16 00:00:00 +03:00
 summary: Object-oriented storage for Ruby objects based on relational database model
 require_paths: 
 - lib
@@ -58,6 +58,9 @@ files:
 - tests/rubernate/impl/dbi_mysql_test.rb
 - tests/rubernate/impl/dbi_oracle_test.rb
 - tests/rubernate/impl/memory_test.rb
+- tests/rubernate/impl/queries_mysql_test.rb
+- tests/rubernate/impl/queries_oracle_test.rb
+- tests/rubernate/impl/queries_stub.rb
 - README
 test_files: 
 - tests/all_tests.rb