lore 0.4.5 → 0.4.6

data/lib/lore/table_accessor.rb

@@ -794,7 +794,7 @@ public
   # instance holding it. 
   # Note that this method is operating on a Table_Accessor instance, not
   # on class Table_Accessor itself. 
-  def initialize(instance_attrib_values, field_names, joined_models=[], cache=nil) 
+  def initialize(instance_attrib_values, joined_models=[], cache=nil) 
   # {{{
     @loaded_from_cache = (cache == :cached)
     # set instance variables. 
@@ -821,6 +821,7 @@ public
         }
       }
     end
+
     setup_instance()
   end # }}}
 
@@ -1544,19 +1545,66 @@ private
     
   end # }}}
 
+private 
+
+  def self.distribute_attrib_values(attrib_values)
+  # {{{
+    values = Hash.new
+    # Predefine
+    attrib_name_array = Array.new 
+    # distribute attrib names to tables: 
+    get_attributes().each_pair { |table, attribs|
+      table_values = Hash.new
+     
+      attrib_name_array = Array.new
+      attrib_values.each_pair { |attrib_name, attrib_value|
+        attrib_name = attrib_name.to_s
+        attrib_name_array = attrib_name.split('.') 
+        
+        if attribs.include? attrib_name then
+          table_values[attrib_name] = attrib_value
+        elsif attribs.include? attrib_name_array.at(2) and
+            attrib_name_array.at(0)+'.'+attrib_name_array.at(1) == table then
+          table_values[attrib_name_array.at(2)] = attrib_value
+        end
+      }
+      values[table] = table_values
+    }
+    values
+  end # }}}
+ 
+public 
+
+  # Create a shallow instance, that is: An instance with no reference to 
+  # DB model. Attribute values passed to Table_Accessor.create_shallow are 
+  # not processed through hooks, filters, and validation. 
+  # Values are, however, processed through output filters. 
+  # Usage and result is 
+  # the same as for Table_Accessor.create, but it only returns 
+  # an accessor instance, without storing it in the database. 
+  # To commit a shallow copy to database (and thus process given attribute 
+  # values through stages mentioned before), call #commit. 
+  def self.create_shallow(attrib_values)
+    before_create(attrib_values)
+    values = distribute_attrib_values(attrib_values)
+    flat_attribs = []
+    get_all_table_names.each { |table|
+      get_attributes[table].each { |attrib|
+        flat_attribs << (values[table][attrib])
+      }
+    }
+    instance = self.new(flat_attribs)
+  end
+
 public
   
   ##########################################################################
   # Returns a new Table_Accessor instance by inserting given attribute 
   # values into db and returning an instance for further operations. 
-  def self.create(attrib_values)
+  def self.create(attrib_values={})
   # {{{
     before_create(attrib_values)
 
-    values = Hash.new
-    
-    Lore.log { 'KLASS: ' << attrib_values.class.to_s } 
-    Lore.log { 'INSERTING VALUES: ' << attrib_values.inspect }
     input_filters = get_input_filters
     attrib_key  = ''
     attrib_name = ''
@@ -1574,26 +1622,7 @@ public
     }
     after_filters(attrib_values)
     
-    # Predefine
-    attrib_name_array = Array.new 
-    # distribute attrib names to tables: 
-    get_attributes().each_pair { |table, attribs|
-      table_values = Hash.new
-     
-      attrib_name_array = Array.new
-      attrib_values.each_pair { |attrib_name, attrib_value|
-        attrib_name = attrib_name.to_s
-        attrib_name_array = attrib_name.split('.') 
-        
-        if attribs.include? attrib_name then
-          table_values[attrib_name] = attrib_value
-        elsif attribs.include? attrib_name_array.at(2) and
-            attrib_name_array.at(0)+'.'+attrib_name_array.at(1) == table then
-          table_values[attrib_name_array.at(2)] = attrib_value
-        end
-      }
-      values[table] = table_values
-    }
+    values = distribute_attrib_values(attrib_values)
     
     begin
       before_validation(values)
@@ -1621,10 +1650,6 @@ public
       }
     end
     
-    # Create klass instance via new: 
-    # Cuba::Module.new(self, attrib_values)
-    
-    # Create klass instance via load (wrapper of new): 
     obj = self.load(select_keys)
     after_create(obj)
     
@@ -1657,6 +1682,10 @@ public
 
     return false if select_keys.empty? 
     
+    # We have to perform a select here instead of returning 
+    # the instance with given attribute values, as this is the 
+    # only way to retreive attribute values set in the DB via
+    # default values, triggers, etc.
     cp = Clause.for(self)
     c = Clause.new
     select_keys.each_pair { |k,v|

data/lib/lore/table_deleter.rb

@@ -102,6 +102,8 @@ module Table_Deleter # :nodoc:
     Context.enter(accessor.get_context) unless accessor.get_context.nil?
     begin
       Lore::Connection.perform("BEGIN;\n#{query_string}\nCOMMIT;")
+    rescue ::Exception => excep
+      Lore::Connection.perform("ROLLBACK;")
     ensure
       Context.leave unless accessor.get_context.nil?
     end

data/lib/lore/table_inserter.rb

@@ -154,6 +154,8 @@ module Table_Inserter # :nodoc:
     
     begin
       Lore::Connection.perform("BEGIN;\n#{query_string}\nCOMMIT;")
+    rescue ::Exception => excep
+      Lore::Connection.perform("ROLLBACK;")
     ensure
       Lore::Context.leave unless accessor.get_context.nil?
     end

data/lib/lore/table_instance.rb

@@ -41,7 +41,6 @@ end # class
 # This module holds methods provided by Table_Accessor instances. 
 module Table_Instance
 
-
   # retreive class instance variables from concrete 
   # Table_Accessor this object is an instance of: 
   def setup_instance() # :nodoc: 

data/lib/lore/table_selector.rb

@@ -70,35 +70,6 @@ public
     return query_string
   end # def
 
-public
-
-  # Extracted, recursive method for building the AS-part of 
-  # a SELECT query. 
-  def self.build_as_query(table_fields, 
-                          query_string='')
-
-    return '*' 
-
-    first = query_string == ''
-              
-    table_fields.each_pair { |table_name, fields|
-
-      fields.each { |foreign_field|
-      
-        # base.table.foreign_field = 
-        query_string << ', ' unless first
-        query_string << "\n #{table_name}.#{foreign_field} AS "
-        query_string << "\"#{table_name}.#{foreign_field}\""
-
-        first = false
-      }
-      
-    }
-
-    query_string
-
-  end #def
-  
 protected
 
   def self.build_select_query(accessor,
@@ -106,8 +77,7 @@ protected
   # this is to be wrapped in an adapter to provide DB abstraction: 
 
     table_name = accessor.get_table_name
-    query_string = 'SELECT '
-    query_string << build_as_query(accessor.get_attributes)
+    query_string = 'SELECT * '
     query_string << ' FROM ' << table_name + ' '
     query_string << build_joined_query(accessor)
     query_string << "\n WHERE "
@@ -151,7 +121,7 @@ protected
     end
     
     if(what.nil? || what == '*' || what == '') then
-      query_as_part = build_as_query(accessor.get_attributes)
+      query_as_part = '*'
     else 
       query_as_part = what.to_s      
     end
@@ -232,7 +202,7 @@ protected
     else
       db_result = perform_select(accessor, query_string[:query]).get_rows()
       db_result[:values].each { |row|
-        result.push(accessor.new(row, db_result[:fields], query_string[:joined_models]))
+        result.push(accessor.new(row, query_string[:joined_models]))
       }
       if Lore.cache_enabled? && accessor.entity_cache then
         accessor.entity_cache.create(accessor, query_string, result)
@@ -276,7 +246,7 @@ protected
     else
       db_result = perform_select(accessor, query_string).get_rows()
       db_result[:values].each { |row|
-        result.push(accessor.new(row, db_result[:fields]))
+        result.push(accessor.new(row))
       }
       if Lore.cache_enabled? && accessor.entity_cache then
         accessor.create_entity_cache(query_string, result)

data/lib/lore/table_updater.rb

@@ -142,6 +142,8 @@ module Table_Updater # :nodoc:
     Context.enter(accessor.get_context) unless accessor.get_context.nil?
     begin
       Lore::Connection.perform("BEGIN;\n#{query_string}\nCOMMIT;")
+    rescue ::Exception => excep
+      Lore::Connection.perform("ROLLBACK;")
     ensure
       Context.leave unless accessor.get_context.nil?
     end

data/lib/lore.rb

@@ -3,7 +3,7 @@ require('logger')
 
 module Lore
   
-  VERSION='0.4.5'
+  VERSION='0.4.6'
 
   @logfile = '/var/log/lore/query.log'
   def self.logfile

data/lore.gemspec

@@ -16,7 +16,7 @@ spec = Gem::Specification.new { |s|
     high coverage of native SQL functions and features. 
     Lore is currently using PostgreSQL as database backend. 
   EOF
-  s.version = '0.4.5'
+  s.version = '0.4.6'
   s.author = 'Tobias Fuchs'
   s.email = 'fuchs@atomnode.net'
   s.date = Time.now

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lore
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors: 
 - Tobias Fuchs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-12 00:00:00 +01:00
+date: 2008-11-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency