Rubernate 0.1.6 → 0.1.7

data/lib/rubernate.rb

@@ -37,6 +37,7 @@ module Rubernate
   require 'rubernate/peer'
   require 'rubernate/runtime'  
   require 'rubernate/queries'
+  require 'rubernate/impl/dbi_genpk'
 
   # Rubernate core singelton methods.
   class << self
@@ -53,14 +54,14 @@ module Rubernate
     #   * user - databases user name
     #   * password - databases users password
     def config db, url, user, password
-      impl, init = case db
+      impl, init, gen = case db
         when :mysql : require_mysql
         when :oracle: require_oracle
         when :pg    : require_pg
         when :memory: require_memory
         else raise "Database #{db} not supported" 
       end
-      self.configuration = DBI::Configuration.new impl, init, url, user, password
+      self.configuration = DBI::Configuration.new impl, init, gen, url, user, password
     end
     
         
@@ -108,21 +109,21 @@ module Rubernate
       def require_mysql # :nodoc:  
         require 'rubernate/impl/dbi_mysql'
         require 'rubernate/init/init_mysql'
-        [DBI::MySqlRuntime, DBI::MySqlInit.new]
+        [DBI::MySqlRuntime, DBI::MySqlInit.new, nil]
       end
 
       # Loads Oracle module 
       def require_oracle # :nodoc:  
         require 'rubernate/impl/dbi_oracle'
         require 'rubernate/init/init_oracle'    
-        [DBI::OracleRuntime, DBI::OracleInit.new]
+        [DBI::OracleRuntime, DBI::OracleInit.new, DBI::OraPKChunkFactory.new]
       end
       
       # Loads Postgres module 
       def require_pg # :nodoc:
         require 'rubernate/impl/dbi_pg'
         require 'rubernate/init/init_pg'
-        [DBI::PgRuntime, DBI::PgInit.new]
+        [DBI::PgRuntime, DBI::PgInit.new, DBI::PgPKChunkFactory.new]
       end
       
       # Loads Memory module used only for testing :nodoc: 

data/lib/rubernate/impl/dbi_generic.rb

@@ -31,15 +31,16 @@ module DBI
   P_TIME   =   6
   P_REF    =   7  
   
-   # Holds configuration information and serves as factory for Runtime objects.
+  # Holds configuration information and serves as factory for Runtime objects.
   class Configuration
     # Accepts Runtime impl class,  db initializer class, database url, user name, and user password
-    def initialize klass, init, db_url, db_user, db_password
+    def initialize klass, init, pkcf, db_url, db_user, db_password
       @klass, @init, @db_url, @db_user, @db_password = klass, init, db_url, db_user, db_password
+      PKGenerator.chunk_factory = pkcf
       # @params = {'AutoCommit' => false} #TODO: refine  
     end
-        
-    # Creates initialized PeerHost
+    
+    # Creates initialized Runtime
     def create
       @klass.new connect     
     end
@@ -68,12 +69,16 @@ module DBI
   class Runtime < Rubernate::Runtime
     include DBI
     
-    # In some implementations parameters are deleted automatically with corresponding r_object records    
-    DELETE_PARAMS = <<-SQL    
-        DELETE FROM R_PARAMS WHERE OBJECT_PK = ? 
+    DELETE_PARAMS = <<-SQL
+        DELETE FROM R_PARAMS WHERE OBJECT_PK = ? AND NAME = ? 
         SQL
-    DELETE_PARAMS_FOR = <<-SQL    
-        DELETE FROM R_PARAMS WHERE OBJECT_PK IN 
+    INSERT_PARAMS = <<-SQL
+        INSERT INTO R_PARAMS VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+        SQL
+    UPDATE_PARAMS = <<-SQL
+        UPDATE R_PARAMS SET FLAGS = ?, INT_VALUE = ?, FLT_VALUE = ?, 
+                       STR_VALUE =  ?, DAT_VALUE = ?, REF_VALUE = ?
+            WHERE OBJECT_PK = ? AND NAME = ?
         SQL
     DELETE_OBJECT = <<-SQL
         DELETE FROM R_OBJECTS WHERE OBJECT_PK = ?
@@ -81,9 +86,6 @@ module DBI
     CREATE_PEER = <<-SQL
         INSERT INTO R_OBJECTS (OBJECT_PK, OBJECT_CLASS) values (?, ?)
         SQL
-    SAVE_PARAMS = <<-SQL
-        INSERT INTO R_PARAMS VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-        SQL
     SELECT_PARAMS = <<-SQL
         SELECT P.*, R.OBJECT_CLASS, O.OBJECT_CLASS
             FROM R_PARAMS P JOIN R_OBJECTS O ON (O.OBJECT_PK = P.OBJECT_PK)
@@ -113,21 +115,13 @@ module DBI
     # Updates object state in database
     def save objects
       objects = [objects] unless objects.kind_of? Array
-      return if objects.empty?
-      # clear r_params for objects
-      clear_params objects
-      # store r_params for objects
-      @dbh.prepare SAVE_PARAMS do |sth|
-        for object in objects
-          object.__peer.each {|name, param|
-            save_param sth, object, name.to_s, param
-          }
-        end
-      end
-      # clear dirty flag
-      for object in objects
-        object.__peer.dirty = false
-      end        
+      return if objects.empty?      
+      # gather parameters changes
+      create, delete, update, insert = gather_changes objects
+      bulk_o_create create unless create.empty? # create virtual objects   
+      bulk_p_delete delete unless delete.empty? # delete  params 
+      bulk_p_update update unless update.empty? # update params 
+      bulk_p_insert insert unless insert.empty? # insert   params
     end
         
     # Loads object by primary_key
@@ -173,7 +167,8 @@ module DBI
       @dbh.rollback rescue Log.error 'Error during rollback in session failed state'
       @dbh.disconnect rescue Log.error 'Error during disconnect in session failed state'
     end
-    private
+
+    private   
       # Select objects from database by query and determines objects
       # that should be loaded and put them to buffer.
       def find_buffer query, params, buffer
@@ -197,45 +192,117 @@ module DBI
           }
         }
       end
-
-      # Delete entries corresponding to objects from r_params 
-      def clear_params objects
-        @dbh.do DELETE_PARAMS_FOR + object_ids_p(objects)
+      
+      # Returns tree arrays [delete, update, insert] each of which consist of two values [object, attr_name]
+      def gather_changes objects
+        create, delete, update, insert = [], [], [], []
+        for obj in objects
+          create << obj if obj.__virtual?
+          for attr, change in obj.__peer.change_track
+            track, value = [obj, attr], obj.__peer[attr]
+            if change == :inserted   # New values shoud be inserted
+              insert << track unless value.is_a? Persistent and ref_lost? obj, attr, value
+            else                     # Updated values should be considered by another way
+              case value
+                when Rubernate::Peer::Container : # Collections 
+                  delete << track    # first delete all values
+                  insert << track    # second insert again all values
+                when Persistent :    
+                  if ref_lost? obj, attr, value
+                    delete << track
+                  else
+                    update << track
+                  end
+                when nil: delete << track
+                else update << track # just update record in database
+              end
+            end
+          end
+          obj.__virtual    = false # reset virtual flag
+          obj.__peer.dirty = false # reset dirty flag
+        end
+        [create, delete, update, insert]
       end
       
+      def bulk_o_create objects
+        @dbh.prepare CREATE_PEER do |sth|
+          objects.each {|obj| sth.execute obj.primary_key, obj.class.name}
+        end     
+      end
+
+      def bulk_p_delete params
+        @dbh.prepare DELETE_PARAMS do |sth|
+          params.each {|obj, attr| sth.execute obj.primary_key, attr.to_s}
+        end
+      end
+
+      def bulk_p_insert params
+        @dbh.prepare INSERT_PARAMS do |sth|
+          params.each {|obj, attr|
+            save_param sth, obj, attr.to_s, obj.__peer[attr]
+          }
+        end
+      end
+
+      def bulk_p_update params
+        @dbh.prepare UPDATE_PARAMS do |sth|
+          params.each {|obj, attr|
+            update_param sth, obj.primary_key, attr.to_s, obj.__peer[attr]
+          }
+        end
+      end
+       
       def save_param sth, obj, name, param
         case param
           when Persistent: save_ref   sth, obj, name, param
           when Hash:       save_hash  sth, obj, name, param
           when Array:      save_array sth, obj, name, param
-          when Integer:    save_int   sth, obj.primary_key, name, param
-          when Float:      save_float sth, obj.primary_key, name, param
-          when Time:       save_time  sth, obj.primary_key, name, param
-          when Date:       save_date  sth, obj.primary_key, name, param
-          else             save_str   sth, obj.primary_key, name, param.to_s
+          when Integer:    sth.execute obj.primary_key, name, *row_fmt_int(param)
+          when Float:      sth.execute obj.primary_key, name, *row_fmt_float(param)
+          when Time:       sth.execute obj.primary_key, name, *row_fmt_time(param)
+          when Date:       sth.execute obj.primary_key, name, *row_fmt_date(param)
+          else             sth.execute obj.primary_key, name, *row_fmt_str(param)
         end
       end
-
-      def save_int sth, pk, name, int
-        sth.execute pk, name, PARAM_FLAG_INT, int, nil, nil, nil, nil
+      
+      def update_param sth, pk, name, param
+        row_fmt = case param
+          when Persistent: row_fmt_ref    param 
+          when Integer:    row_fmt_int    param 
+          when Float:      row_fmt_float  param
+          when Time:       row_fmt_time   param
+          when Date:       row_fmt_date   param
+          when Hash:       raise 'internal error Hash  is not supposed to be updated'
+          when Array:      raise 'internal error Array is not supposed to be updated'
+          else             row_fmt_str    param # It's supposed to be string here
+        end
+        sth.execute *(row_fmt << pk << name)
       end
 
-      def save_float sth, pk, name, float
-        sth.execute pk, name, PARAM_FLAG_FLOAT, nil, float, nil, nil, nil
+      def row_fmt_int int
+        [PARAM_FLAG_INT, int, nil, nil, nil, nil]
       end
-
-      def save_str sth, pk, name, str
-        sth.execute pk, name, PARAM_FLAG_STRING, nil, nil, str, nil, nil
-      end   
       
-      def save_time sth, pk, name, time
-        sth.execute pk, name, PARAM_FLAG_TIME, nil, nil, nil, TimeType.new(time), nil
+      def row_fmt_float float
+        [PARAM_FLAG_FLOAT, nil, float, nil, nil, nil]
+      end
+       
+      def row_fmt_str str
+        [PARAM_FLAG_STRING, nil, nil, str, nil, nil]
+      end
+        
+      def row_fmt_time time
+        [PARAM_FLAG_TIME, nil, nil, nil, TimeType.new(time), nil]
+      end
+      
+      def row_fmt_date time
+        [PARAM_FLAG_DATE, nil, nil, nil, TimeType.new(time), nil]
+      end
+      
+      def row_fmt_ref obj
+        [PARAM_FLAG_REF, nil, nil, nil, nil, obj.primary_key]
       end
       
-      def save_date sth, pk, name, date
-        sth.execute pk, name, PARAM_FLAG_DATE, nil, nil, nil, TimeType.new(date), nil
-      end      
-
       def save_ref sth, obj, name, ref
         sth.execute obj.primary_key, name, PARAM_FLAG_REF, nil, nil, nil, nil, 
           ref.primary_key unless ref_lost? obj, name, ref
@@ -258,8 +325,7 @@ module DBI
           when ::Date:  sth.execute pk, name, HASH_DATE_REF,   nil, nil, nil, TimeType.new(key), ref
           when ::Time:  sth.execute pk, name, HASH_TIME_REF,   nil, nil, nil, TimeType.new(key), ref
           when nil:     sth.execute pk, name, PARAM_FLAG_HASH, nil, nil, nil, nil, ref
-          else
-            raise "invalid hash key value #{key}"
+          else          raise "invalid hash key value #{key}"
         end
       end
       

data/lib/rubernate/impl/dbi_genpk.rb

@@ -0,0 +1,67 @@
+require 'thread'
+
+module Rubernate
+module DBI
+  class PKChunk
+    def initialize first, size
+      @next, @limit = first, first + size
+    end
+    def empty?
+      @next >= @limit
+    end
+    def get_pk
+      @next+= 1
+      @next - 1
+    end
+  end
+  
+  class PKChunkFactory
+    PK_CHUNCK_SIZE = 25 # Pk chunck size (step of sequence).     
+    
+    # Returns new chunk
+    def create dbh
+      PKChunk.new dbh.select_all(@get_from_seq)[0][0].to_i, PK_CHUNCK_SIZE
+    end
+  end
+
+  # Represents primary key generator
+  class PKGenerator  
+    class << self
+      attr_accessor :chunk_factory
+      
+      # Gets PKGenerator instance
+      def instance
+        PKGenerator.new
+      end
+      
+      @@chunk_pool_lock = Mutex.new
+      @@chunk_pool = []
+      # Acquires chunk
+      def acquire_chunk dbh     
+        @@chunk_pool_lock.synchronize {
+          return @@chunk_pool.shift unless @@chunk_pool.empty?
+        }
+        self.chunk_factory.create dbh
+      end
+      # Release chunk
+      def release_chunk chunk
+        @@chunk_pool_lock.synchronize {
+          @@chunk_pool << chunk
+        }    
+      end
+    end
+
+    # Generates pk.
+    def generate dbh
+      @chunk = self.class.acquire_chunk dbh if @chunk.nil? or @chunk.empty?
+      @chunk.get_pk
+    end
+    
+    # Should be invoked at the end of the session.
+    def release
+      self.class.release_chunk @chunk if @chunk and !@chunk.empty?
+      @chunk = nil
+    end    
+  end
+end
+end

data/lib/rubernate/impl/dbi_mysql.rb

@@ -1,4 +1,5 @@
 require 'dbi'
+require 'rubernate/impl/dbi_genpk'
 require 'rubernate/impl/dbi_generic'
 
 module Rubernate

data/lib/rubernate/impl/dbi_oracle.rb

@@ -1,34 +1,43 @@
 require 'dbi'
+require 'rubernate/impl/dbi_genpk'
 require 'rubernate/impl/dbi_generic'
 
 module Rubernate
 module DBI
-  class OracleRuntime < Runtime
+  class OraPKChunkFactory < PKChunkFactory
     SELECT_NEXT_PK = <<-SQL
         SELECT R_PK_SEQUENCE.NEXTVAL FROM DUAL
         SQL
-          
+    def initialize
+      @get_from_seq = SELECT_NEXT_PK
+    end
+  end
+
+  class OracleRuntime < Runtime
+    def initialize dbh
+      super
+      @pk_gen = PKGenerator.new
+    end
+  
     # Creates record in r_objects for specified object
     def create object
       object.__peer = Rubernate::Peer.new unless object.__peer 
-      object.primary_key = @dbh.select_one(SELECT_NEXT_PK)[0].to_i
-      @dbh.do CREATE_PEER, object.primary_key, object.class.name
+      object.primary_key  = @pk_gen.generate @dbh
+      object.__virtual    = true
       object.__peer.dirty = true
       object.primary_key
-    end            
+    end
+    
+    def close
+      super
+      @pk_gen.release
+    end
+    
+    def failed
+      @pk_gen.release
+    end
     
     private
-      # Oracle requires that IN list must be less or equal to 1000 items
-      def clear_params objects
-        return super if objects.size <= 1000
-        idx = 0
-        while chunck = objects.slice(idx, 1000)
-          break if chunck.empty?
-          super chunck
-          idx+= chunck.size
-        end
-      end
-
       # Oracle requires that IN list must be less or equal to 1000 items
       def load_buffer buffer
         return super if buffer.size <= 1000

data/lib/rubernate/impl/dbi_pg.rb

@@ -3,30 +3,40 @@ require 'rubernate/impl/dbi_generic'
 
 module Rubernate
 module DBI
-  class PgRuntime < Runtime
+  class PgPKChunkFactory < PKChunkFactory
     SELECT_NEXT_PK = <<-SQL
         SELECT NEXTVAL('R_PK_SEQUENCE')        
         SQL
-    
+    def initialize
+      @get_from_seq = SELECT_NEXT_PK
+    end
+  end
+  
+  class PgRuntime < Runtime    
     # Invokes super and then issues 'BEGIN'
     def initialize dbh
       super
       dbh.do 'BEGIN'
+      @pk_gen = PKGenerator.new
     end
      
     # Creates record in r_objects for specified object
     def create object
       object.__peer = Rubernate::Peer.new unless object.__peer 
-      object.primary_key = @dbh.select_one(SELECT_NEXT_PK)[0].to_i
-      @dbh.do CREATE_PEER, object.primary_key, object.class.name
+      object.primary_key = @pk_gen.generate @dbh
+      object.__virtual    = true
       object.__peer.dirty = true
       object.primary_key
     end
-
+   
     # Issues 'COMMIT' against database.
     def close
       dbh.do 'COMMIT'
-      super
+      @pk_gen.release   
+    end
+    
+    def failed
+      @pk_gen.release
     end
   end  
 end

data/lib/rubernate/init/init_oracle.rb

@@ -30,7 +30,7 @@ module DBI
         CREATE INDEX R_P_PK_NAME ON R_PARAMS (OBJECT_PK, NAME)
         }.gsub(INDENT, '')
     CREATE_R_PK_SEQUENCE = %q{
-        CREATE SEQUENCE R_PK_SEQUENCE START WITH 1001 INCREMENT BY 1
+        CREATE SEQUENCE R_PK_SEQUENCE START WITH 1001 INCREMENT BY 25
         }.gsub(INDENT, '')
         
     TEMPLATE = %q{

data/lib/rubernate/init/init_pg.rb

@@ -27,7 +27,7 @@ module DBI
         CREATE INDEX R_O_CLASS    ON R_OBJECTS (OBJECT_CLASS)
         }.gsub(INDENT, '')
     CREATE_R_PK_SEQUENCE = %q{        
-        CREATE SEQUENCE R_PK_SEQUENCE;
+        CREATE SEQUENCE R_PK_SEQUENCE INCREMENT BY 25;
         }.gsub(INDENT, '')
         
     TEMPLATE = %q{

data/lib/rubernate/peer.rb

@@ -1,10 +1,25 @@
+require 'set'
+
 module Rubernate
 # Represent objects peer - properties holder.
 class Peer < Hash
+  # Retrus change track of attribute modifications
+  #   Hash {p_name => :inserted, :}
+  def change_track 
+    @change_track ||= Hash.new
+    each do |name, value|
+      if value.is_a? Container and not @change_track.has_key? name
+        @change_track[name] = :modified if value.recall
+      end
+    end
+    @change_track
+  end
+  
   # Sets peers dirty flag to specified value.
   # And resets dirty flag for all properites which stored in this peer.
   def dirty= f_dirty
     @dirty = f_dirty
+    @change_track = nil unless f_dirty
     for value in values
       value.memorize! if value.is_a? Container
     end
@@ -13,7 +28,7 @@ class Peer < Hash
   # If peers dirty flag set to true returns it immediately
   # else iterate over all properties and returns true if dirty
   # property apperas. +on_modify+ callback invoked if dirty is +true+.
-  def dirty? &on_modify
+  def dirty?
     return true if @dirty
     f_dirty, name, value, old_value = false
     each do |name, value|
@@ -21,6 +36,7 @@ class Peer < Hash
         old_value = value.recall
         if old_value
           f_dirty = dirty = true
+          update_track name, :modified
           break
         end
       end
@@ -47,6 +63,7 @@ class Peer < Hash
     else
       delete key
     end
+    update_track key, change_type(old_value, value)
     yield key, old_value, value if block_given?
   end
     
@@ -66,5 +83,17 @@ class Peer < Hash
       return self != @copy ? @copy : nil 
     end
   end
+  
+  private
+    def change_type old_value, new_value
+      return :inserted if old_value.nil? 
+      return :inserted if old_value.is_a? Persistent and old_value.removed?
+      return :modified      
+    end
+  
+    def update_track key, type
+      @change_track ||= Hash.new
+      @change_track[key] = type unless @change_track.has_key? key
+    end
 end
 end

data/lib/rubernate/persistent.rb

@@ -48,12 +48,22 @@ module Persistent
       @__peer = value
     end
   end
+
+  # This property is implementation internal and should not be used by users.
+  attr_writer :__virtual # :nodoc:
+
+  # This property indicates that object is virtual i.e. not stored in database.
+  def __virtual? # :nodoc:
+    @__virtual
+  end
   
   # Defines metod == in for rubernated classes
   def self.included klass
     klass.module_eval %{
       def == other
-        return self.primary_key == other.primary_key if other.is_a? Persistent
+        return false unless other.is_a? Persistent
+        return false if self.removed? or other.removed?
+        return self.primary_key == other.primary_key
         super
       end
     }

data/lib/rubernate/queries.rb

@@ -334,8 +334,7 @@ module Queries
       @pk, @klass = @factory.field(self, 'object_pk'), @factory.field(self, 'object_class')
     end
     
-    # Fiends access expressions
-    attr_reader :pk, :klass, :to_sql     
+    attr_reader :pk, :klass, :to_sql
 
     # Creates subclasses constraint
     def derived klass

data/tests/rubernate/impl/dbi_generic_stub.rb

@@ -12,8 +12,8 @@ module DBI::GenericTests
   include DBI
   include FixtureClasses
   
-  def init rt_class, db_url, db_user, db_password
-    @factory = Configuration.new rt_class, nil, db_url, db_user, db_password
+  def init rt_class, gen, db_url, db_user, db_password
+    @factory = Configuration.new rt_class, nil, gen, db_url, db_user, db_password
     @factory.connect {|dbh| 
       dbh.do 'delete from r_params'
       dbh.do 'delete from r_objects'
@@ -44,10 +44,12 @@ module DBI::GenericTests
     o = C1.new
     o.__peer = Peer.new
     @runtime.create o
+    @runtime.save o
+    
     rows = @runtime.dbh.select_all 'select * from r_objects'
     assert_equal 1, rows.size
     assert_equal C1.name, rows[0][1]
-    assert o.__peer.dirty?
+    assert !o.__peer.dirty?
   end
   
   def test_save_objects
@@ -89,6 +91,7 @@ module DBI::GenericTests
     @runtime.create o
     @runtime.save o
     rows = @runtime.dbh.select_all 'select * from r_params'
+
     assert_equal  1, rows.size
     assert_equal  o.primary_key, rows[0][P_PK].to_i
     assert_equal PARAM_FLAG_INT, rows[0][P_FLAGS].to_i
@@ -122,6 +125,7 @@ module DBI::GenericTests
     for i in 1..10
       hash[i] = C2.new
       @runtime.create hash[i]
+      @runtime.save hash[i]
     end
     o, o.p1 = C1.new, hash
     
@@ -145,9 +149,11 @@ module DBI::GenericTests
     hash = {777 => C2.new}
 
     @runtime.create hash[777]
+    @runtime.save   hash[777]
     
     hash['key'] = C2.new
     @runtime.create hash['key']
+    @runtime.save   hash['key']
     
     o, o.p1 = C1.new, hash
     
@@ -183,6 +189,7 @@ module DBI::GenericTests
     for i in 0..9
       o = C2.new
       @runtime.create o
+      @runtime.save o     
       array[i] = o
     end
     o, o.p1 = C1.new, array
@@ -211,8 +218,7 @@ module DBI::GenericTests
     @runtime.create o2
     
     o1.p1 = o2
-    @runtime.save o1
-    @runtime.save o2
+    @runtime.save [o1, o2]
     
     assert 1, @runtime.dbh.select_all(
       'select * from r_objects where object_pk = ?', o1.primary_key).size
@@ -280,7 +286,7 @@ module DBI::GenericTests
   end
   
   def test_param_type_date
-    pk, date = nil, Date.today    
+    pk, date = nil, Date.today
     Rubernate.session {o = C1.new.attach;  o.p1 = date; pk = o.primary_key}
     Rubernate.session {
       o = find_by_pk pk
@@ -419,8 +425,8 @@ module GenericRuntimeTests
   include Queries
   include FixtureClasses
   
-  def init rt_class, db_url, db_user, db_password
-    @factory = Configuration.new rt_class, nil, db_url, db_user, db_password
+  def init rt_class, gen, db_url, db_user, db_password
+    @factory = Configuration.new rt_class, nil, gen, db_url, db_user, db_password
     @factory.connect {|dbh| 
       dbh.do 'delete from r_params'
       dbh.do 'delete from r_objects'
@@ -617,17 +623,76 @@ module GenericRuntimeTests
   def test_remove_referred
     pk1, pk2 = nil
     Rubernate.session do
-      o1,  o2  = C1.new.attach, C1.new.attach
+      o1,  o2  = C2.new.attach, C1.new.attach
       pk1, pk2 = o1.primary_key, o2.primary_key
-      o1.p1 = o2
+      o1.p1, o1.p2 = o2, 'initial'
     end
     Rubernate.session do
       o1 = find_by_pk pk1
       o2 = find_by_pk pk2
+      assert_equal 'initial', o1.p2
       assert_equal o2, o1.p1
+      o1.p2 = 'updated'
       o2.remove!
       assert o1.p1.removed?
     end
+    Rubernate.session do
+      o1 = find_by_pk pk1
+      assert_nil o1.p1
+      assert_equal 'updated', o1.p2
+    end
+  end
+  
+  def test_insert_removed
+    pk1, pk2 = nil
+    Rubernate.session do
+      o1,  o2  = C1.new.attach,  C1.new.attach
+      pk1, pk2 = o1.primary_key, o2.primary_key
+    end
+    Rubernate.session do
+      o1 = find_by_pk pk1
+      o2 = find_by_pk pk2
+      o2.remove!
+      o1.p1 = o2
+    end
+    Rubernate.session do
+      o1 = find_by_pk pk1
+      assert_nil o1.p1
+    end
+  end
+
+  def test_override_removed
+    pk1, pk2 = nil
+    Rubernate.session do
+      o1,  o2  = C1.new.attach,  C1.new.attach
+      pk1, pk2 = o1.primary_key, o2.primary_key
+      o1.p1 = o2
+    end 
+    Rubernate.session do
+      o1 = find_by_pk pk1
+      o2 = find_by_pk pk2
+      o2.remove!
+      o1.p1 = o1
+    end
+    Rubernate.session do
+      o1 = find_by_pk pk1
+      assert_equal o1, o1.p1
+    end
+  end
+  
+  def test_update_by_removed
+    pk1, pk2 = nil
+    Rubernate.session do
+      o1,  o2  = C1.new.attach,  C1.new.attach
+      pk1, pk2 = o1.primary_key, o2.primary_key
+      o1.p1 = 'initial'
+    end 
+    Rubernate.session do
+      o1 = find_by_pk pk1
+      o2 = find_by_pk pk2
+      o2.remove!
+      o1.p1 = o2
+    end
     Rubernate.session do
       o1 = find_by_pk pk1
       assert_nil o1.p1
@@ -750,5 +815,41 @@ module GenericRuntimeTests
       assert o1.p2[2].__peer.is_a?(Peer)
     end
   end
+  
+  def test_find_virtual
+    Rubernate.session do
+      o = C1.new.attach      
+      assert_equal o, find_by_pk(o.primary_key)
+    end
+    
+    Rubernate.session do
+      o = C1.new.attach
+      assert_equal o, find_by_query('Select :o; Where o.pk == :pk', :pk => o.primary_key)[0]
+    end
+  end    
+    
+  def test_remove_virtual
+    pk = nil
+    Rubernate.session do
+      o = C1.new.attach
+      pk = o.primary_key
+      o.remove!
+    end
+    Rubernate.session do
+      assert_raise(ObjectNotFoundException) {find_by_pk pk}
+    end
+  end
+  
+  def test_pk_gen
+    return unless PKGenerator.chunk_factory
+    gen = PKGenerator.instance
+    Rubernate.session do
+      pk = gen.generate dbh
+      51.times do
+        old, pk = pk, gen.generate(dbh)
+        assert_equal old + 1, pk
+      end
+    end
+  end
 end
 end

data/tests/rubernate/impl/dbi_mysql_test.rb

@@ -7,13 +7,13 @@ require 'rubernate/impl/dbi_generic_stub'
 class Rubernate::DBI::MysqlTest < Test::Unit::TestCase
   include Rubernate::DBI::GenericTests  
   def setup
-    init MYSQL_RUNTIME_CLASS, MYSQL_DB_URL, MYSQL_DB_USER, MYSQL_DB_PWD
+    init MYSQL_RUNTIME_CLASS, nil, MYSQL_DB_URL, MYSQL_DB_USER, MYSQL_DB_PWD
   end
 end
 
 class Rubernate::DBI::MysqlRuntimeTest < Test::Unit::TestCase
   include Rubernate::GenericRuntimeTests  
   def setup
-    init MYSQL_RUNTIME_CLASS, MYSQL_DB_URL, MYSQL_DB_USER, MYSQL_DB_PWD
+    init MYSQL_RUNTIME_CLASS, nil, MYSQL_DB_URL, MYSQL_DB_USER, MYSQL_DB_PWD
   end
 end

data/tests/rubernate/impl/dbi_oracle_test.rb

@@ -10,7 +10,7 @@ module DBI
   class OracleTest < Test::Unit::TestCase
     include Rubernate::DBI::GenericTests 
     def setup
-      init ORA_RUNTIME_CLASS, ORA_DB_URL, ORA_DB_USER, ORA_DB_PWD      
+      init ORA_RUNTIME_CLASS, OraPKChunkFactory.new, ORA_DB_URL, ORA_DB_USER, ORA_DB_PWD      
     end
 =begin
     # This methods test bug appers when we try 
@@ -37,7 +37,7 @@ module DBI
   class OracleRuntimeTest < Test::Unit::TestCase
     include Rubernate::GenericRuntimeTests  
     def setup
-      init ORA_RUNTIME_CLASS, ORA_DB_URL, ORA_DB_USER, ORA_DB_PWD
+      init ORA_RUNTIME_CLASS, OraPKChunkFactory.new, ORA_DB_URL, ORA_DB_USER, ORA_DB_PWD
     end
   end
 end

data/tests/rubernate/impl/dbi_pg_test.rb

@@ -9,14 +9,14 @@ module DBI
   class PgTest < Test::Unit::TestCase
     include Rubernate::DBI::GenericTests 
     def setup
-      init PG_RUNTIME_CLASS, PG_DB_URL, PG_DB_USER, PG_DB_PWD
+      init PG_RUNTIME_CLASS, PgPKChunkFactory.new, PG_DB_URL, PG_DB_USER, PG_DB_PWD
     end
   end
  
   class PgRuntimeTest < Test::Unit::TestCase
     include Rubernate::GenericRuntimeTests  
     def setup
-      init PG_RUNTIME_CLASS, PG_DB_URL, PG_DB_USER, PG_DB_PWD 
+      init PG_RUNTIME_CLASS, PgPKChunkFactory.new, PG_DB_URL, PG_DB_USER, PG_DB_PWD 
     end
   end
 end

data/tests/rubernate/rubernate_test.rb

@@ -264,6 +264,23 @@ module Rubernate
       assert_not_nil a.recall
       assert_equal 4, a[1] 
     end
+    
+    def test_change_track
+      peer = Peer.new
+      peer[:p1] = 'new'
+      assert_equal({:p1 => :inserted}, peer.change_track)
+      peer.dirty = false
+      peer[:p2] = ["new_element"]
+      assert_equal({:p2 => :inserted}, peer.change_track)
+      peer.dirty = false
+      peer[:p1] = 'updated'
+      peer[:p2] << 'array_updated'
+      assert_equal({:p1 => :modified, :p2 => :modified}, peer.change_track) 
+      peer.dirty = false
+      peer[:p1] = nil
+      peer[:p2] = nil
+      assert_equal({:p1 => :modified, :p2 => :modified}, peer.change_track)
+    end
   end
 
   class Rubernate::BaseRuntimeTest < Test::Unit::TestCase

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: Rubernate
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
-date: 2006-03-30 00:00:00 +04:00
+  version: 0.1.7
+date: 2006-05-23 00:00:00 +04:00
 summary: Object-oriented storage for Ruby objects based on relational database model
 require_paths: 
 - lib
@@ -40,6 +40,7 @@ files:
 - lib/rubernate/queries.rb
 - lib/rubernate/runtime.rb
 - lib/rubernate/impl/dbi_generic.rb
+- lib/rubernate/impl/dbi_genpk.rb
 - lib/rubernate/impl/dbi_mysql.rb
 - lib/rubernate/impl/dbi_oracle.rb
 - lib/rubernate/impl/dbi_pg.rb