lore 0.4.3 → 0.4.5

data/lib/lore/table_instance.rb

@@ -88,7 +88,8 @@ module Table_Instance
   def marshal_dump
     { 
       :klass => self.class.to_s, 
-      :values => get_attribute_values
+      :values => get_attribute_values, 
+      :joined => @joined_models
     }
   end
 
@@ -112,7 +113,8 @@ module Table_Instance
   # Creates an instance of self from marshalled value set. 
   def marshal_load(dump)
     klass = eval(dump[:klass])
-    return initialize(dump[:values], :cached)
+    dump[:joined].map { |m| m = eval(m) }
+    return initialize(dump[:values], dump[:fields], dump[:joined], :cached)
   end
 
   # Whether this instance has been loaded from 

data/lib/lore/table_selector.rb

@@ -163,7 +163,7 @@ protected
 
     clause_string = ''
     if block_given? then
-      yield_obj  = Lore::Clause_Parser.new(accessor.table_name, *(accessor.get_attributes))
+      yield_obj  = Lore::Clause_Parser.new(accessor)
       clause  = yield *yield_obj
     end
     # Extend AS part by attributes that have been added in clause
@@ -190,7 +190,7 @@ protected
     #  but generating a Plan instead the query. 
     #  Pass block& to Plan_Clause, too, only in case a plan is needed. 
 
-    return query_string
+    return { :query => query_string, :joined_models => clause.parts[:joined] }
     
   end
 
@@ -210,7 +210,7 @@ protected
                                 accessor, 
                                 &block)
 
-    return perform_select(accessor, query_string)
+    return perform_select(accessor, query_string[:query])
   
   end # def 
 
@@ -230,9 +230,9 @@ protected
       result = nil if result == ''
       @@logger.debug { "cache contents for #{accessor.table_name} found: #{result.to_s != ''}" } 
     else
-      db_result = perform_select(accessor, query_string)
-      db_result.get_rows[:values].each { |row|
-        result.push(accessor.new(row))
+      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]))
       }
       if Lore.cache_enabled? && accessor.entity_cache then
         accessor.entity_cache.create(accessor, query_string, result)
@@ -241,6 +241,7 @@ protected
     return result
   end # def
 
+  # DELETE ME
   def self.select_on_keys(accessor, 
                           value_keys)
 
@@ -255,7 +256,7 @@ protected
     args_string = ''
     args.map { |a| a = Lore::TYPE_NAMES[a] } 
     if args.to_s != '' && args.length > 0 then args_string = "(#{args.join(',')})" end
-    query_string = "PREPARE #{accessor.table_name.gsub('.','_')}__#{plan_name.to_s}#{args_string} AS " << select_query(nil, accessor, &block)
+    query_string = "PREPARE #{accessor.table_name.gsub('.','_')}__#{plan_name.to_s}#{args_string} AS " << select_query(nil, accessor, &block)[:query]
     begin
       result = Lore::Connection.perform(query_string)
     rescue ::Exception => excep
@@ -273,9 +274,9 @@ protected
       result = nil if result == ''
       @@logger.debug { "cache contents for prepared #{accessor.table_name}: #{result.to_s.inspect}" } 
     else
-      db_result = perform_select(accessor, query_string)
-      db_result.get_rows[:values].each { |row|
-        result.push(accessor.new(row))
+      db_result = perform_select(accessor, query_string).get_rows()
+      db_result[:values].each { |row|
+        result.push(accessor.new(row, db_result[:fields]))
       }
       if Lore.cache_enabled? && accessor.entity_cache then
         accessor.create_entity_cache(query_string, result)
@@ -305,7 +306,7 @@ private
       raise pge
     ensure
       Context.leave unless accessor.get_context.nil?
-      GC.start
+    # GC.start
     end
  end
 

data/lib/lore.rb

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

data/lore.gemspec

@@ -12,9 +12,11 @@ spec = Gem::Specification.new { |s|
     (multiple) inheritance, a comfortable query syntax, 
     highly customizable automated form generation, 
     and result caching using memory mapping (MMap). 
+    It aims at performance, usability and - unlike most ORMs - 
+    high coverage of native SQL functions and features. 
     Lore is currently using PostgreSQL as database backend. 
   EOF
-  s.version = '0.4.3'
+  s.version = '0.4.5'
   s.author = 'Tobias Fuchs'
   s.email = 'fuchs@atomnode.net'
   s.date = Time.now
@@ -34,8 +36,8 @@ spec = Gem::Specification.new { |s|
 
   s.has_rdoc = true
   s.rdoc_options << '--title' << 'Lore ORM' <<
-                       '--main' << 'README.txt' <<
-                       '--line-numbers'
+                     '--main' << 'Lore::Model' <<
+                     '--line-numbers'
 
   s.homepage = 'http://lore.rubyforge.org'
 

data/test/model.rb

@@ -1,6 +1,6 @@
 
 require 'rubygems'
-require('lore/test/env')
+require('./test/env')
 require('lore/model')
 
 Lore::Context.enter :test

data/test/tc_aspect.rb

@@ -1,6 +1,6 @@
 
 require 'test/unit'
-require('lore/test/model')
+require('./test/model')
 
 
 module Lore

data/test/tc_cache.rb

@@ -1,8 +1,7 @@
 
 require 'test/unit'
 
-require('lore/test/model')
-require('lore/test/ts_lore')
+require('./test/model')
 
 module Lore
 module Unit
@@ -40,6 +39,9 @@ module Unit
     end
 
     def test_basic
+      Lore.enable_cache
+      Car.use_entity_cache Lore::Cache::Mmap_Entity_Cache
+
       passed = true
       org_name = Car.all.entity.name
       20.times { 
@@ -62,6 +64,7 @@ module Unit
         cached_inst.commit
         passed = passed && (!Lore.cache_enabled? || !cached_inst.is_cached_entity?)
       }
+      Lore.disable_cache
       assert(passed, 'Cached value and original value differ') 
     end
 

data/test/tc_clause.rb

@@ -1,6 +1,6 @@
 
 require 'test/unit'
-require('lore/test/model')
+require('./test/model')
 require('lore/clause')
 
 module Lore

data/test/tc_deep_inheritance.rb

@@ -1,6 +1,6 @@
 
 require 'test/unit'
-require 'lore/test/model'
+require './test/model'
 require 'lore/symbol'
 
 module Lore

data/test/tc_factory.rb

@@ -1,6 +1,6 @@
 
 require 'test/unit'
-require 'lore/test/model'
+require './test/model'
 require 'lore/model_factory'
 require 'lore/gui/form_generator'
 

data/test/tc_filter.rb

@@ -1,6 +1,6 @@
 
 require 'test/unit'
-require 'lore/test/model'
+require './test/model'
 
 module Lore
 module Unit

data/test/tc_form.rb

@@ -1,7 +1,7 @@
 
 require 'test/unit'
 require 'lore/gui/form_generator'
-require 'lore/test/model'
+require './test/model'
 
 module Lore
 module Unit

data/test/tc_model.rb

@@ -1,6 +1,6 @@
 
 require 'test/unit'
-require 'lore/test/model'
+require './test/model'
 require 'lore/symbol'
 
 module Lore
@@ -43,8 +43,8 @@ module Unit
     
     def test_create
       v = Vehicle.create(:name => 'Async', :maxspeed => 100, 
-                     :owner_id => 0, :num_seats => 2, 
-                     :manuf_id => 0)
+                         :num_seats => 2, 
+                         :manuf_id => 0)
 
       car_type = Car_Type.create(:name => 'Basic_Type')
       assert_equal(car_type.name, 'Basic_Type')
@@ -55,6 +55,60 @@ module Unit
       ct.delete
     end
 
+    def test_joined_attributes_order
+
+      num_loops = 25
+
+      Vehicle_Owner.delete_all
+      owners = []
+      vehicles = []
+      for i in 0...num_loops do
+        o = Owner.create(:name => "owner_#{i}")
+        v = Vehicle.create(:name => 'Async', :maxspeed => 10*i, 
+                           :num_seats => i, 
+                           :manuf_id => i)
+        j = Vehicle_Owner.create(:vehicle_id => v.id, :owner_id => o.id)
+        owners << o
+        vehicles << v
+      end
+      vo = Vehicle_Owner.find(num_loops).sort_by(:vehicle_id, :asc).entities
+      for i in 0...vo.length do
+        assert_equal(owners[i].id, vo[i].owner_id)
+        assert_equal(vehicles[i].id, vo[i].vehicle_id)
+      end
+
+      join = Vehicle_Owner.select { |vo| 
+        vo.join(Vehicle).on(Vehicle_Owner.vehicle_id == Vehicle.id) { |v|
+          v.join(Owner).on(Owner.owner_id == Vehicle_Owner.owner_id) { |o|
+            o.where(true)
+            o.limit(num_loops)
+            o.order_by(:vehicle_id, :asc)
+          }
+        }
+      }
+      assert_equal(num_loops, join.length)
+
+      for i in 0...join.length do
+        fulljoin = join[i]
+        assert_equal(owners[i].id, fulljoin.owner_id)
+        assert_equal(vehicles[i].id, fulljoin.vehicle_id)
+      end
+
+      join_ids = Vehicle_Owner.select_values(:vehicle_id) { |vo| 
+        vo.join(Vehicle).on(Vehicle_Owner.vehicle_id == Vehicle.id) { |v|
+          v.join(Owner).on(Owner.owner_id == Vehicle_Owner.owner_id) { |o|
+            o.where(true)
+            o.limit(num_loops)
+            o.order_by(:vehicle_id, :asc)
+          }
+        }
+      }
+      for i in 0...join_ids.length do
+        assert_equal(vehicles[i].id, join_ids[i])
+      end
+
+    end
+
     def test_create_with_inheritance
       car_type = Car_Type.create(:name => 'Temp')
       inst_attribs =  { 

data/test/tc_prepare.rb

@@ -1,8 +1,7 @@
 
 require 'test/unit'
 
-require('lore/test/model')
-require('lore/test/ts_lore')
+require('./test/model')
 
 module Lore
 module Unit

data/test/tc_refined_query.rb

@@ -1,6 +1,6 @@
 
 require 'test/unit'
-require('lore/test/model')
+require('./test/model')
 require('lore/clause')
 
 module Lore

data/test/tc_table_accessor.rb

@@ -253,6 +253,8 @@ module Unit
 
       assert(!c1_s.nil? && c1_s[Vehicle.name] == '318i')
 
+      c1.delete
+
     end
 
     def test_create_multi_inherit

data/test/tc_thread.rb

@@ -0,0 +1,100 @@
+
+require 'test/unit'
+require './test/model'
+require 'lore/symbol'
+
+module Lore
+module Unit
+
+
+  class TC_Model < Test::Unit::TestCase
+
+    def setup
+    end
+
+    def teardown
+    end
+
+    def test_simple
+      t1 = Thread.new { 
+        30.times { 
+          Car.find(10)
+        }
+      }
+      t2 = Thread.new { 
+        30.times { 
+          Car.find(10)
+        }
+      }
+      t3 = Thread.new { 
+        30.times { 
+          Car.find(10)
+        }
+      }
+      t1.join
+      t2.join
+      t3.join
+    end
+    def test_create
+      c1 = Car.create(
+        :manuf_id    => 0, 
+        :name        => '318i', 
+        :num_seats   => 5, 
+        :maxspeed    => 180, 
+        :num_doors   => 5, 
+        :owner_id    => 1,
+        :car_type_id => 23
+      )
+      c1.delete
+      return
+      t1 = Thread.new { 
+        30.times { 
+          c1 = Car.create(
+            :manuf_id    => 0, 
+            :name        => '318i', 
+            :num_seats   => 5, 
+            :maxspeed    => 180, 
+            :num_doors   => 5, 
+            :owner_id    => 1,
+            :car_type_id => 23
+          )
+          c1.delete
+        }
+      }
+      t2 = Thread.new { 
+        30.times { 
+          c1 = Car.create(
+            :manuf_id    => 0, 
+            :name        => '318i', 
+            :num_seats   => 5, 
+            :maxspeed    => 180, 
+            :num_doors   => 5, 
+            :owner_id    => 1,
+            :car_type_id => 23
+          )
+          c1.delete
+        }
+      }
+      t3 = Thread.new { 
+        30.times { 
+          c1 = Car.create(
+            :manuf_id    => 0, 
+            :name        => '318i', 
+            :num_seats   => 5, 
+            :maxspeed    => 180, 
+            :num_doors   => 5, 
+            :owner_id    => 1,
+            :car_type_id => 23
+          )
+          c1.delete
+        }
+      }
+      t1.join
+      t2.join
+      t3.join
+    end
+
+  end
+
+end
+end

data/test/test_lore.rb

@@ -1,23 +1,24 @@
 
+require 'rubygems'
 require 'test/unit/testsuite'
 
 require('lore')
 Lore.logfile = './lore_test.log'
 require('rubygems')
-require('lore/test/model')
+require('./test/model')
 require('lore/connection')
 require('lore/cache/mmap_entity_cache')
 
-require('lore/test/tc_table_accessor')
-require('lore/test/tc_clause')
-require('lore/test/tc_model')
-require('lore/test/tc_form')
-require('lore/test/tc_cache')
-require('lore/test/tc_factory')
-require('lore/test/tc_refined_query')
-require('lore/test/tc_filter')
-require('lore/test/tc_deep_inheritance')
-require('lore/test/tc_prepare')
+require('./test/tc_table_accessor')
+require('./test/tc_clause')
+require('./test/tc_model')
+require('./test/tc_form')
+require('./test/tc_cache')
+require('./test/tc_factory')
+require('./test/tc_refined_query')
+require('./test/tc_filter')
+require('./test/tc_deep_inheritance')
+require('./test/tc_prepare')
 
 module Lore
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lore
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.5
 platform: ruby
 authors: 
 - Tobias Fuchs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-10 00:00:00 +01:00
+date: 2008-11-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0.1"
     version: 
-description: Lore is an object-relational mapping (ORM) implementation  providing many features like prepared statements,  (multiple) inheritance, a comfortable query syntax,  highly customizable automated form generation,  and result caching using memory mapping (MMap).  Lore is currently using PostgreSQL as database backend.
+description: Lore is an object-relational mapping (ORM) implementation  providing many features like prepared statements,  (multiple) inheritance, a comfortable query syntax,  highly customizable automated form generation,  and result caching using memory mapping (MMap).  It aims at performance, usability and - unlike most ORMs -  high coverage of native SQL functions and features.  Lore is currently using PostgreSQL as database backend.
 email: fuchs@atomnode.net
 executables: []
 
@@ -31,6 +31,7 @@ extra_rdoc_files: []
 
 files: 
 - History.txt
+- custom_models.rb
 - lib
 - Manifest.txt
 - bin
@@ -38,7 +39,6 @@ files:
 - Rakefile
 - lore.gemspec
 - LICENSE
-- lore-0.4.3.gem
 - lib/lore
 - lib/lore.rb
 - lib/lore/table_updater.rb
@@ -118,6 +118,7 @@ files:
 - test/tc_refined_query.rb
 - test/tc_deep_inheritance.rb
 - test/prepare.rb
+- test/tc_thread.rb
 - test/tc_model.rb
 - test/README
 - test/model.rb
@@ -127,7 +128,6 @@ files:
 - test/tc_aspect.rb
 - test/tc_filter.rb
 - test/env.rb
-- test/lore_test.log
 - test/benchmark
 - test/tc_factory.rb
 - test/tc_prepare.rb
@@ -139,7 +139,7 @@ rdoc_options:
 - --title
 - Lore ORM
 - --main
-- README.txt
+- Lore::Model
 - --line-numbers
 require_paths: 
 - lib