Rubernate 0.1.4 → 0.1.5

data/lib/rubernate/callbacks.rb

@@ -32,8 +32,7 @@ module Callbacks
     end
     
     # Invoked if object referred by this one has been deleted
-    # TODO: implement invokations
-    def on_lose_ref refered_by
+    def on_lose_ref ref_prop, ref_obj
     end
   end
  

data/lib/rubernate/impl/dbi_generic.rb

@@ -21,6 +21,16 @@ module DBI
   HASH_TIME_REF       = (PARAM_FLAG_HASH  | PARAM_FLAG_TIME).to_i
   HASH_DATE_REF       = (PARAM_FLAG_HASH  | PARAM_FLAG_DATE).to_i
 
+  # Indexes of columns  of R_PARAMS table
+  P_PK     =   0 
+  P_NAME   =   1
+  P_FLAGS  =   2    
+  P_INT    =   3
+  P_FLT    =   4
+  P_STR    =   5
+  P_TIME   =   6
+  P_REF    =   7  
+  
    # 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
@@ -69,6 +79,9 @@ module DBI
     DELETE_OBJECT = <<-SQL
         DELETE FROM R_OBJECTS WHERE OBJECT_PK = ?
         SQL
+    CREATE_PEER = <<-SQL
+        INSERT INTO R_OBJECTS (OBJECT_PK, OBJECT_CLASS) values (?, ?)
+        SQL
     SAVE_PARAMS = <<-SQL
         INSERT INTO R_PARAMS VALUES (?, ?, ?, ?, ?, ?, ?, ?)
         SQL
@@ -87,17 +100,9 @@ module DBI
                 WHERE O.OBJECT_PK = ?
         SQL
     
-    # R_PARAMS table's column's indexes
-    P_PK     =   0 
-    P_NAME   =   1
-    P_FLAGS  =   2    
-    P_INT    =   3
-    P_FLT    =   4
-    P_STR    =   5
-    P_TIME   =   6
-    P_REF    =   7 # Refered object PK
-    P_REF_CLASS =   8 # Refered object Class
-    P_CLASS     =   9 # Self object Class
+    # Adition columns for R_PARAMS table joined ...
+    P_REF_CLASS =   8 # with  REF_VALUE
+    P_CLASS     =   9 # with OBJECT_PK
     
     attr :dbh, false
     
@@ -116,7 +121,7 @@ module DBI
       @dbh.prepare SAVE_PARAMS do |sth|
         for object in objects
           object.peer.each {|name, param|
-            save_param sth, object.primary_key, name.to_s, param
+            save_param sth, object, name.to_s, param
           }
         end
       end
@@ -184,16 +189,16 @@ module DBI
       @dbh.disconnect rescue Log.error 'Error during disconnect in session failed state'
     end
     private
-      def save_param sth, pk, name, param
+      def save_param sth, obj, name, param
         case param
-          when Persistent:    save_ref   sth, pk, name, param
-          when Hash:      save_hash  sth, pk, name, param
-          when Array:     save_array sth, pk, name, param
-          when Integer:   save_int   sth, pk, name, param
-          when Float:     save_float sth, pk, name, param
-          when Time:      save_time  sth, pk, name, param
-          when Date:      save_date  sth, pk, name, param
-          else            save_str   sth, pk, name, param.to_s
+          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
         end
       end
 
@@ -217,16 +222,17 @@ module DBI
         sth.execute pk, name, PARAM_FLAG_DATE, nil, nil, nil, TimeType.new(date), nil
       end      
 
-      def save_ref sth, pk, name, ref
-        sth.execute pk, name, PARAM_FLAG_REF, nil, nil, nil, nil, ref.primary_key unless ref.removed?
+      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
       end
       
-      def save_hash sth, pk, name, hash
-        hash.delete_if {|key, ref| ref.removed?} # Discard removed objects
+      def save_hash sth, obj, name, hash
+        ref_lost_hash obj, name, hash
         if hash.empty?
-          sth.execute pk, name, PARAM_FLAG_HASH, 0, nil, nil, nil, nil
+          sth.execute obj.primary_key, name, PARAM_FLAG_HASH, 0, nil, nil, nil, nil
         else
-          hash.each {|key, ref| save_key_value sth, pk, name, key, ref.primary_key}
+          hash.each {|key, ref| save_key_value sth, obj.primary_key, name, key, ref.primary_key}
         end
       end  
       
@@ -235,20 +241,20 @@ module DBI
           when Integer: sth.execute pk, name, HASH_INT_REF,    key, nil, nil, nil, ref
           when Float:   sth.execute pk, name, HASH_FLOAT_REF,  nil, key, nil, nil, ref
           when String:  sth.execute pk, name, HASH_STRING_REF, nil, nil, key, nil, ref
-          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 ::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}"
         end
       end
       
-      def save_array sth, pk, name, array
-        array.delete_if {|ref| !ref or ref.removed?} # Discard removed and nil items
+      def save_array sth, obj, name, array
+        ref_lost_array obj, name, array
         if array.empty? # Empty arrays should also be stored
-          sth.execute pk, name, ARRAY_INT_REF, 0, nil, nil, nil, nil
+          sth.execute obj.primary_key, name, ARRAY_INT_REF, 0, nil, nil, nil, nil
         else
-          array.each_index {|idx| sth.execute pk, name, 
+          array.each_index {|idx| sth.execute obj.primary_key, name, 
             ARRAY_INT_REF, idx, nil, nil, nil, array[idx].primary_key}
         end
       end

data/lib/rubernate/impl/dbi_mysql.rb

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

data/lib/rubernate/impl/dbi_oracle.rb

@@ -1,4 +1,5 @@
 require 'dbi'
+require 'rubernate/impl/dbi_generic'
 
 module Rubernate
 module DBI
@@ -6,9 +7,6 @@ module DBI
     SELECT_NEXT_PK = <<-SQL
         SELECT R_PK_SEQUENCE.NEXTVAL FROM DUAL
         SQL
-    CREATE_PEER = <<-SQL
-        INSERT INTO R_OBJECTS (OBJECT_PK, OBJECT_CLASS) values (?, ?)
-        SQL
           
     # Creates record in r_objects for specified object
     def create object

data/lib/rubernate/impl/dbi_pg.rb

@@ -0,0 +1,33 @@
+require 'dbi'
+require 'rubernate/impl/dbi_generic'
+
+module Rubernate
+module DBI
+  class PgRuntime < Runtime
+    SELECT_NEXT_PK = <<-SQL
+        SELECT NEXTVAL('R_PK_SEQUENCE')        
+        SQL
+    
+    # Invokes super and then issues 'BEGIN'
+    def initialize dbh
+      super
+      dbh.do 'BEGIN'
+    end
+     
+    # Creates record in r_objects for specified object
+    def create object
+      object.peer = Rubernate::Peer.new
+      object.primary_key = @dbh.select_one(SELECT_NEXT_PK)[0].to_i
+      @dbh.do CREATE_PEER, object.primary_key, object.class.name
+      object.peer.dirty = true
+      object.primary_key
+    end
+
+    # Issues 'COMMIT' against database.
+    def close
+      dbh.do 'COMMIT'
+      super
+    end
+  end  
+end
+end

data/lib/rubernate/impl/memory.rb

@@ -1,9 +1,11 @@
 require 'rubernate/queries'
 
 module Rubernate
+# This module contains implementation of Runtime that operates with memory instead database.
+# It is intended only of testing.
 module Memory
   module Queries
-    class Query < Rubernate::Queries::Generic::Expr 
+    class Query < Rubernate::Queries::Expr 
       def params v
         case v
           when Array: v
@@ -12,6 +14,7 @@ module Memory
         end
       end
     end
+    
     class Factory < Rubernate::Queries::Factory
       def initialize
         super
@@ -19,6 +22,7 @@ module Memory
       end
     end
   end
+  
   class Reference
     attr_reader  :primary_key, :object_class
     def initialize pk, klass
@@ -101,24 +105,26 @@ module Memory
     def save objects
       objects = [objects] unless objects.kind_of? Array
       for object in objects
-        @database[object.primary_key] = [object.class, save_peer(object.peer)]
+        @database[object.primary_key] = [object.class, save_peer(object)]
         object.peer.dirty = false
       end
     end
     
-    def save_peer peer
+    def save_peer obj
       result = {}
-      peer.each {|key, value| result[key] = save_param value }
+      obj.peer.each {|key, value| result[key] = save_param obj, key, value}
       result
     end
     
-    def save_param value
+    def save_param obj, param, value
       case value
-        when Persistent: 
-          Reference.new value.primary_key, value.class
+        when Persistent:         
+          Reference.new value.primary_key, value.class unless ref_lost? obj, param, value
         when Array: 
+          ref_lost_array obj, param, value
           value.collect{ |item| Reference.new item.primary_key, item.class }
         when Hash:
+          ref_lost_hash obj, param, value
           result = {}
           value.each {|key, value| 
             result[key] = Reference.new value.primary_key, value.class

data/lib/rubernate/init/init_generic.rb

@@ -0,0 +1,25 @@
+require 'erb'
+
+module Rubernate
+module DBI
+  # Base class for all database intitalizators
+  class GenericInit
+    # Used to remove leading spaces in scripts
+    INDENT = /^        /
+
+    # Prints initialization script and tryes to initialize databaes database if dbh is given.
+    # Must be implemented by subclasses.
+    def init_db dbh=nil
+      raise 'Not implemented...'
+    end    
+        
+    private
+      def exec_ddl dbh, stat
+        dbh.do stat
+        'done'
+        rescue Exception => e
+          "failed: #{e}"
+      end    
+  end
+end
+end

data/lib/rubernate/init/init_mysql.rb

@@ -1,13 +1,14 @@
 require 'erb'
+require 'rubernate/init/init_generic'
 
 module Rubernate
 module DBI
-  class MySqlInit
+  class MySqlInit < GenericInit
     CREATE_R_OBJECTS = %q{
         CREATE TABLE R_OBJECTS (
           OBJECT_PK       INTEGER(20)     PRIMARY KEY AUTO_INCREMENT,
           OBJECT_CLASS    VARCHAR(100)    NOT NULL) ENGINE=InnoDB;
-        }.gsub(/^        /, '')
+        }.gsub(INDENT, '')
     
     CREATE_R_PARAMS = %q{
         CREATE TABLE R_PARAMS (
@@ -21,13 +22,13 @@ module DBI
             REF_VALUE       INTEGER(20),
           CONSTRAINT R_PARAM_FK FOREIGN KEY (OBJECT_PK) REFERENCES R_OBJECTS(OBJECT_PK) ON DELETE CASCADE,
           CONSTRAINT R_REF_FK   FOREIGN KEY (REF_VALUE) REFERENCES R_OBJECTS(OBJECT_PK) ON DELETE CASCADE)  ENGINE=InnoDB;
-        }.gsub(/^        /, '')
+        }.gsub(INDENT, '')
     CREATE_INDEX_O_PK_CLASS = %q{
         CREATE INDEX R_O_PK_CLASS ON R_OBJECTS (OBJECT_PK   ASC, OBJECT_CLASS);
-        }.gsub(/^        /, '')
+        }.gsub(INDENT, '')
     CREATE_INDEX_P_PK_NAME  = %q{
         CREATE INDEX R_P_PK_NAME ON R_PARAMS (OBJECT_PK   ASC, NAME);
-        }.gsub(/^        /, '')
+        }.gsub(INDENT, '')
         
     TEMPLATE = %q{
         #
@@ -46,10 +47,10 @@ module DBI
         #
         # End        
         #         
-        }.gsub(/^        /, '')
+        }.gsub(INDENT, '')
     
     # Prints initialization script and tryes to initialize databaes database if dbh is given.
-    def self.init_db dbh=nil
+    def init_db dbh=nil
       puts ERB.new(TEMPLATE).result(binding)
       if dbh
         puts "\nInitializing database ... "
@@ -59,13 +60,6 @@ module DBI
         puts "Creation of index on r_params  - #{exec_ddl dbh, CREATE_INDEX_P_PK_NAME}"           
       end
     end
-    
-    def self.exec_ddl dbh, stat
-      dbh.do stat
-      'done'
-      rescue Exception => e
-        "failed: #{e}"
-    end    
   end
 end
 end

data/lib/rubernate/init/init_oracle.rb

@@ -1,13 +1,14 @@
 require 'erb'
+require 'rubernate/init/init_generic'
 
 module Rubernate
 module DBI
-  class OracleInit
+  class OracleInit < GenericInit
   CREATE_R_OBJECTS = %q{
         CREATE TABLE R_OBJECTS (
           OBJECT_PK       NUMBER(20)      PRIMARY KEY,
           OBJECT_CLASS    VARCHAR2(100)   NOT NULL) 
-        }.gsub(/^        /, '')
+        }.gsub(INDENT, '')
     
     CREATE_R_PARAMS = %q{
         CREATE TABLE R_PARAMS (
@@ -21,16 +22,16 @@ module DBI
             REF_VALUE       NUMBER(20),
           CONSTRAINT R_PARAM_FK FOREIGN KEY (OBJECT_PK) REFERENCES R_OBJECTS(OBJECT_PK) ON DELETE CASCADE,
           CONSTRAINT R_REF_FK   FOREIGN KEY (REF_VALUE) REFERENCES R_OBJECTS(OBJECT_PK) ON DELETE CASCADE)    
-        }.gsub(/^        /, '')
+        }.gsub(INDENT, '')
     CREATE_INDEX_O_PK_CLASS = %q{
         CREATE INDEX R_O_PK_CLASS ON R_OBJECTS (OBJECT_PK   ASC, OBJECT_CLASS)
-        }.gsub(/^        /, '')
+        }.gsub(INDENT, '')
     CREATE_INDEX_P_PK_NAME  = %q{
         CREATE INDEX R_P_PK_NAME ON R_PARAMS (OBJECT_PK   ASC, NAME)
-        }.gsub(/^        /, '')
+        }.gsub(INDENT, '')
     CREATE_R_PK_SEQUENCE = %q{
         CREATE SEQUENCE R_PK_SEQUENCE START WITH 1001 INCREMENT BY 1
-        }.gsub(/^        /, '')
+        }.gsub(INDENT, '')
         
     TEMPLATE = %q{
         /**
@@ -57,15 +58,14 @@ module DBI
         /**
          * Create primary key sequence
          */ <%= CREATE_R_PK_SEQUENCE %>/
-
          
         /**
          * End
          */
-        }.gsub(/^        /, '')
+        }.gsub(INDENT, '')
     
     # Prints initialization script and tryes to initialize databaes database if dbh is given.
-    def self.init_db dbh=nil
+    def init_db dbh
       puts ERB.new(TEMPLATE).result(binding)
       if dbh
         puts "\nInitializing database ... "
@@ -76,13 +76,6 @@ module DBI
         puts "Creation of pk sequence        - #{exec_ddl dbh, CREATE_R_PK_SEQUENCE}"
       end
     end
-    
-    def self.exec_ddl dbh, stat
-      dbh.do stat
-      'done'
-      rescue Exception => e
-        "failed: #{e}"
-    end    
   end
 end
 end

data/lib/rubernate/init/init_pg.rb

@@ -0,0 +1,78 @@
+require 'erb'
+require 'rubernate/init/init_generic'
+
+module Rubernate
+module DBI
+  class PgInit < GenericInit
+    CREATE_R_OBJECTS = %q{
+        CREATE TABLE R_OBJECTS (
+           OBJECT_PK    INTEGER PRIMARY KEY,
+           OBJECT_CLASS VARCHAR(100))  
+        }.gsub(INDENT, '')    
+    CREATE_R_PARAMS = %q{
+        CREATE TABLE R_PARAMS (
+            OBJECT_PK       INTEGER    NOT NULL  REFERENCES R_OBJECTS(OBJECT_PK) ON DELETE CASCADE,
+            NAME            VARCHAR    NOT NULL,
+            FLAGS           INTEGER    NOT NULL,
+            INT_VALUE       INTEGER,
+            FLT_VALUE       FLOAT,
+            STR_VALUE       VARCHAR,
+            DAT_VALUE       TIMESTAMP WITH TIME ZONE,
+            REF_VALUE       INTEGER   REFERENCES R_OBJECTS(OBJECT_PK) ON DELETE CASCADE)    
+        }.gsub(INDENT, '')
+    CREATE_INDEX_O_PK_CLASS = %q{
+        CREATE INDEX R_O_PK_CLASS ON R_OBJECTS (OBJECT_PK, OBJECT_CLASS)
+        }.gsub(INDENT, '')
+    CREATE_INDEX_P_PK_NAME  = %q{
+        CREATE INDEX R_O_CLASS    ON R_OBJECTS (OBJECT_CLASS)
+        }.gsub(INDENT, '')
+    CREATE_R_PK_SEQUENCE = %q{        
+        CREATE SEQUENCE R_PK_SEQUENCE;
+        }.gsub(INDENT, '')
+        
+    TEMPLATE = %q{
+        /**
+         * Creates Rubernate tables for PostgreSQL database.
+         * Copyright (C) 2006 Andrey Ryabov <andrey_ryabov@bk.ru>
+         */
+        
+        /**
+         * Create r_objects table 
+         */ <%= CREATE_R_OBJECTS %>/
+        
+        /**
+         * Create r_params table  
+         */ <%= CREATE_R_PARAMS %>/
+        
+        /**
+         * Create index on r_objects 
+         */ <%= CREATE_INDEX_O_PK_CLASS %>/
+        
+        /**
+         * Create index on r_params  
+         */ <%= CREATE_INDEX_P_PK_NAME %>/
+
+        /**
+         * Create primary key sequence
+         */ <%= CREATE_R_PK_SEQUENCE %>/
+         
+        /**
+         * End
+         */
+        }.gsub(INDENT, '')
+    
+    # Prints initialization script and tryes to initialize databaes database if dbh is given.
+    def init_db dbh=nil
+      puts ERB.new(TEMPLATE).result(binding)
+      if dbh
+        puts "\nInitializing database ... "
+        puts "Creation of r_objects          - #{exec_ddl dbh, CREATE_R_OBJECTS}"
+        puts "Creation of r_params           - #{exec_ddl dbh, CREATE_R_PARAMS}"
+        puts "Creation of pk sequence        - #{exec_ddl dbh, CREATE_R_PK_SEQUENCE}"
+        puts "Creation of index on r_objects - #{exec_ddl dbh, CREATE_INDEX_O_PK_CLASS}"
+        puts "Creation of index on r_params  - #{exec_ddl dbh, CREATE_INDEX_P_PK_NAME}"
+      end
+    end
+  end
+end
+end