rpbertp13-dm-core 0.9.11.1 → 0.9.11.2

data/History.txt

@@ -1,4 +1,4 @@
-=== 0.9.11 / 2009-03-29
+=== 0.9.11 / not released
 
 * 1 major enhancement:
 

data/dm-core.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-core}
-  s.version = "0.9.11.1"
+  s.version = "0.9.11.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
@@ -24,17 +24,17 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<data_objects>, ["~> 0.10.0"])
+      s.add_runtime_dependency(%q<data_objects>, ["~> 0.9.11"])
       s.add_runtime_dependency(%q<extlib>, ["~> 0.9.11"])
-      s.add_runtime_dependency(%q<addressable>, ["~> 2.0"])
+      s.add_runtime_dependency(%q<addressable>, ["~> 2.0.2"])
     else
-      s.add_dependency(%q<data_objects>, ["~> 0.10.0"])
+      s.add_dependency(%q<data_objects>, ["~> 0.9.11"])
       s.add_dependency(%q<extlib>, ["~> 0.9.11"])
-      s.add_dependency(%q<addressable>, ["~> 2.0"])
+      s.add_dependency(%q<addressable>, ["~> 2.0.2"])
     end
   else
-    s.add_dependency(%q<data_objects>, ["~> 0.10.0"])
+    s.add_dependency(%q<data_objects>, ["~> 0.9.11"])
     s.add_dependency(%q<extlib>, ["~> 0.9.11"])
-    s.add_dependency(%q<addressable>, ["~> 2.0"])
+    s.add_dependency(%q<addressable>, ["~> 2.0.2"])
   end
 end

data/lib/dm-core.rb

@@ -16,7 +16,7 @@ require 'set'
 require 'time'
 require 'yaml'
 
-gem 'addressable', '~>2.0'
+gem 'addressable', '~>2.0.2'
 require 'addressable/uri'
 
 gem 'extlib', '~>0.9.11'

data/lib/dm-core/adapters/data_objects_adapter.rb

@@ -1,4 +1,4 @@
-gem 'data_objects', '~>0.10.0'
+gem 'data_objects', '~>0.9.11'
 require 'data_objects'
 
 module DataMapper
@@ -615,7 +615,7 @@ module DataMapper
               tm.map(DM::Discriminator).to('VARCHAR').with(:size => Property::DEFAULT_LENGTH)
               tm.map(BigDecimal).to('DECIMAL').with(:precision => Property::DEFAULT_PRECISION, :scale => Property::DEFAULT_SCALE_BIGDECIMAL)
               tm.map(Float).to('FLOAT').with(:precision => Property::DEFAULT_PRECISION)
-              tm.map(DateTime).to('TIMESTAMP')
+              tm.map(DateTime).to('DATETIME')
               tm.map(Date).to('DATE')
               tm.map(Time).to('TIMESTAMP')
               tm.map(TrueClass).to('BOOLEAN')

data/lib/dm-core/adapters/mysql_adapter.rb

@@ -1,4 +1,4 @@
-gem 'do_mysql', '~>0.10.0'
+gem 'do_mysql', '~>0.9.11'
 require 'do_mysql'
 
 module DataMapper
@@ -124,8 +124,6 @@ module DataMapper
               tm.map(Integer).to('INT').with(:size => 11)
               tm.map(TrueClass).to('TINYINT').with(:size => 1)  # TODO: map this to a BIT or CHAR(0) field?
               tm.map(Object).to('TEXT')
-              tm.map(DateTime).to('DATETIME')
-              tm.map(Time).to('DATETIME')
             end
           end
         end # module ClassMethods

data/lib/dm-core/adapters/postgres_adapter.rb

@@ -1,4 +1,4 @@
-gem 'do_postgres', '~>0.10.0'
+gem 'do_postgres', '~>0.9.11'
 require 'do_postgres'
 
 module DataMapper
@@ -174,9 +174,9 @@ module DataMapper
           # TODO: move to dm-more/dm-migrations
           def type_map
             @type_map ||= TypeMap.new(super) do |tm|
-              tm.map(Integer).to('INTEGER')
-              tm.map(BigDecimal).to('NUMERIC').with(:precision => Property::DEFAULT_PRECISION, :scale => Property::DEFAULT_SCALE_BIGDECIMAL)
-              tm.map(Float).to('DOUBLE PRECISION')
+              tm.map(DateTime).to('TIMESTAMP')
+              tm.map(Integer).to('INT4')
+              tm.map(Float).to('FLOAT8')
             end
           end
         end # module ClassMethods

data/lib/dm-core/adapters/sqlite3_adapter.rb

@@ -1,4 +1,4 @@
-gem 'do_sqlite3', '~>0.10.0'
+gem 'do_sqlite3', '~>0.9.11'
 require 'do_sqlite3'
 
 module DataMapper

data/lib/dm-core/associations/relationship.rb

@@ -8,47 +8,54 @@ module DataMapper
       # @api private
       attr_reader :name, :options, :query
 
+      # @api private
       def child_key
-        child_key = child_model.repository.scope do |r|
-          model_properties = child_model.properties(r.name)
-
-          child_key = parent_key.zip(@child_properties).map do |parent_property,property_name|
-            # TODO: use something similar to DM::NamingConventions to determine the property name
-            parent_name = Extlib::Inflection.underscore(Extlib::Inflection.demodulize(parent_model.base_model.name))
-            property_name ||= "#{parent_name}_#{parent_property.name}".to_sym
-
-            if model_properties.has_property?(property_name)
-              model_properties[property_name]
-            else
-              options = {}
-
-              [ :length, :precision, :scale ].each do |option|
-                options[option] = parent_property.send(option)
+        @child_key ||= begin
+          child_key = nil
+          child_model.repository.scope do |r|
+            model_properties = child_model.properties(r.name)
+
+            child_key = parent_key.zip(@child_properties || []).map do |parent_property,property_name|
+              # TODO: use something similar to DM::NamingConventions to determine the property name
+              parent_name = Extlib::Inflection.underscore(Extlib::Inflection.demodulize(parent_model.base_model.name))
+              property_name ||= "#{parent_name}_#{parent_property.name}".to_sym
+
+              if model_properties.has_property?(property_name)
+                model_properties[property_name]
+              else
+                options = {}
+
+                [ :length, :precision, :scale ].each do |option|
+                  options[option] = parent_property.send(option)
+                end
+
+                # NOTE: hack to make each many to many child_key a true key,
+                # until I can figure out a better place for this check
+                if child_model.respond_to?(:many_to_many)
+                  options[:key] = true
+                end
+
+                child_model.property(property_name, parent_property.primitive, options)
               end
-
-              # NOTE: hack to make each many to many child_key a true key,
-              # until I can figure out a better place for this check
-              if child_model.respond_to?(:many_to_many)
-                options[:key] = true
-              end
-
-              child_model.property(property_name, parent_property.primitive, options)
             end
           end
+          PropertySet.new(child_key)
         end
-        @child_key = PropertySet.new(child_key)
       end
 
       # @api private
       def parent_key
-        parent_key = parent_model.repository.scope do |r|
-          if @parent_properties
-            parent_model.properties(r.name).slice(*@parent_properties)
-          else
-            parent_model.key
+        @parent_key ||= begin
+          parent_key = nil
+          parent_model.repository.scope do |r|
+            parent_key = if @parent_properties
+              parent_model.properties(r.name).slice(*@parent_properties)
+            else
+              parent_model.key
+            end
           end
+          PropertySet.new(parent_key)
         end
-        @parent_key = PropertySet.new(parent_key)
       end
 
       # @api private
@@ -87,7 +94,7 @@ module DataMapper
           grouped_collection = {}
           collection.each do |resource|
             child_value = child_key.get(resource)
-            next unless parent_obj = parent_identity_map[child_value]
+            parent_obj = parent_identity_map[child_value]
             grouped_collection[parent_obj] ||= []
             grouped_collection[parent_obj] << resource
           end

data/lib/dm-core/transaction.rb

@@ -97,6 +97,7 @@ module DataMapper
         end
       else
         raise "Illegal state for commit without block: #{@state}" unless @state == :begin
+        each_adapter(:prepare_adapter, [:rollback_and_close_adapter_if_begin, :rollback_prepared_and_close_adapter_if_prepare])
         each_adapter(:commit_adapter, [:log_fatal_transaction_breakage])
         each_adapter(:close_adapter, [:log_fatal_transaction_breakage])
         @state = :commit
@@ -111,6 +112,7 @@ module DataMapper
     def rollback
       raise "Illegal state for rollback: #{@state}" unless @state == :begin
       each_adapter(:rollback_adapter_if_begin, [:rollback_and_close_adapter_if_begin, :close_adapter_if_none])
+      each_adapter(:rollback_prepared_adapter_if_prepare, [:rollback_prepared_and_close_adapter_if_begin, :close_adapter_if_none])
       each_adapter(:close_adapter_if_open, [:log_fatal_transaction_breakage])
       @state = :rollback
     end
@@ -143,13 +145,13 @@ module DataMapper
 
     def method_missing(meth, *args, &block)
       if args.size == 1 && args.first.is_a?(DataMapper::Adapters::AbstractAdapter)
-        if (match = meth.to_s.match(/^(.*)_if_(none|begin|rollback|commit)$/))
+        if (match = meth.to_s.match(/^(.*)_if_(none|begin|prepare|rollback|commit)$/))
           if self.respond_to?(match[1], true)
             self.send(match[1], args.first) if state_for(args.first).to_s == match[2]
           else
             super
           end
-        elsif (match = meth.to_s.match(/^(.*)_unless_(none|begin|rollback|commit)$/))
+        elsif (match = meth.to_s.match(/^(.*)_unless_(none|begin|prepare|rollback|commit)$/))
           if self.respond_to?(match[1], true)
             self.send(match[1], args.first) unless state_for(args.first).to_s == match[2]
           else
@@ -172,7 +174,7 @@ module DataMapper
     private
 
     def validate_primitive(primitive)
-      [:close, :begin, :rollback, :commit].each do |meth|
+      [:close, :begin, :prepare, :rollback, :rollback_prepared, :commit].each do |meth|
         raise "Invalid primitive #{primitive}: doesnt respond_to?(#{meth.inspect})" unless primitive.respond_to?(meth)
       end
       return primitive
@@ -235,14 +237,27 @@ module DataMapper
       do_adapter(adapter, :begin, :none)
     end
 
+    def prepare_adapter(adapter)
+      do_adapter(adapter, :prepare, :begin);
+    end
+
     def commit_adapter(adapter)
-      do_adapter(adapter, :commit, :begin)
+      do_adapter(adapter, :commit, :prepare)
     end
 
     def rollback_adapter(adapter)
       do_adapter(adapter, :rollback, :begin)
     end
 
+    def rollback_prepared_adapter(adapter)
+      do_adapter(adapter, :rollback_prepared, :prepare)
+    end
+
+    def rollback_prepared_and_close_adapter(adapter)
+      rollback_prepared_adapter(adapter)
+      close_adapter(adapter)
+    end
+
     def rollback_and_close_adapter(adapter)
       rollback_adapter(adapter)
       close_adapter(adapter)

data/lib/dm-core/version.rb

@@ -1,3 +1,3 @@
 module DataMapper
-  VERSION = '0.9.12'.freeze
+  VERSION = '0.9.11'.freeze
 end

data/spec/integration/auto_migrations_spec.rb

@@ -105,7 +105,7 @@ if HAS_SQLITE3
 #        :class         => [ Class,             'VARCHAR(50)',  false, 'Class',                           'Class',           false ],
         :big_decimal   => [ BigDecimal,        'DECIMAL(2,1)', false, '1.1',                             BigDecimal('1.1'), false ],
         :float         => [ Float,             'FLOAT(2,1)',   false, '1.1',                             1.1,               false ],
-        :date_time     => [ DateTime,          'TIMESTAMP',    false, NOW.strftime('%Y-%m-%d %H:%M:%S'), NOW,               false ],
+        :date_time     => [ DateTime,          'DATETIME',     false, NOW.strftime('%Y-%m-%d %H:%M:%S'), NOW,               false ],
         :time_1        => [ Time,              'TIMESTAMP',    false, TIME_STRING_1,                     TIME_1,            false ],
 #SQLite pads out the microseconds to the full 6 digits no matter what the value is - we simply pad up the zeros needed
         :time_2        => [ Time,              'TIMESTAMP',    false, TIME_STRING_2.dup << '00000',      TIME_2,            false ],
@@ -219,10 +219,10 @@ if HAS_MYSQL
         :big_decimal   => [ BigDecimal,        'DECIMAL(2,1)', false, '1.1',                                BigDecimal('1.1'), false ],
         :float         => [ Float,             'FLOAT(2,1)',   false, '1.1',                                1.1,               false ],
         :date_time     => [ DateTime,          'DATETIME',     false, NOW.strftime('%Y-%m-%d %H:%M:%S'),    NOW,               false ],
-        :time_1        => [ Time,              'DATETIME',     false, TIME_1.strftime('%Y-%m-%d %H:%M:%S'), TIME_1,            false ],
-        :time_2        => [ Time,              'DATETIME',     false, TIME_2.strftime('%Y-%m-%d %H:%M:%S'), TIME_2,            false ],
-        :time_3        => [ Time,              'DATETIME',     false, TIME_3.strftime('%Y-%m-%d %H:%M:%S'), TIME_3 ,           false ],
-        :time_4        => [ Time,              'DATETIME',     false, TIME_4.strftime('%Y-%m-%d %H:%M:%S'), TIME_4 ,           false ],
+        :time_1        => [ Time,              'TIMESTAMP',    false, TIME_1.strftime('%Y-%m-%d %H:%M:%S'), TIME_1,            false ],
+        :time_2        => [ Time,              'TIMESTAMP',    false, TIME_2.strftime('%Y-%m-%d %H:%M:%S'), TIME_2,            false ],
+        :time_3        => [ Time,              'TIMESTAMP',    false, TIME_3.strftime('%Y-%m-%d %H:%M:%S'), TIME_3 ,           false ],
+        :time_4        => [ Time,              'TIMESTAMP',    false, TIME_4.strftime('%Y-%m-%d %H:%M:%S'), TIME_4 ,           false ],
         :object        => [ Object,            'TEXT',         true,  nil,                                  nil,               false ],
         :discriminator => [ DM::Discriminator, 'VARCHAR(50)',  false, nil,                                  EveryType,         false ],
       }

data/spec/integration/transaction_spec.rb

@@ -56,5 +56,20 @@ if ADAPTERS.any?
       end
     end
 
+    it "should not commit any changes if any of the adapters doesnt prepare properly" do
+      lambda do
+        DataMapper::Transaction.new(*@repositories) do |transaction|
+          ADAPTERS.each do |name|
+            repository(name) { Sputnik.create(:name => 'hepp') }
+          end
+
+          transaction.primitive_for(@repositories.last.adapter).should_receive(:prepare).and_throw(Exception.new("I am the famous test exception"))
+        end
+      end.should raise_error(Exception, /I am the famous test exception/)
+
+      ADAPTERS.each do |name|
+        repository(name) { Sputnik.all.size.should == 0 }
+      end
+    end
   end
 end

data/spec/unit/transaction_spec.rb

@@ -30,11 +30,15 @@ describe DataMapper::Transaction do
     @repository_adapter.should_receive(:transaction_primitive).any_number_of_times.and_return(@repository_transaction_primitive)
     @transaction_primitive.should_receive(:respond_to?).any_number_of_times.with(:close).and_return(true)
     @transaction_primitive.should_receive(:respond_to?).any_number_of_times.with(:begin).and_return(true)
+    @transaction_primitive.should_receive(:respond_to?).any_number_of_times.with(:prepare).and_return(true)
     @transaction_primitive.should_receive(:respond_to?).any_number_of_times.with(:rollback).and_return(true)
+    @transaction_primitive.should_receive(:respond_to?).any_number_of_times.with(:rollback_prepared).and_return(true)
     @transaction_primitive.should_receive(:respond_to?).any_number_of_times.with(:commit).and_return(true)
     @repository_transaction_primitive.should_receive(:respond_to?).any_number_of_times.with(:close).and_return(true)
     @repository_transaction_primitive.should_receive(:respond_to?).any_number_of_times.with(:begin).and_return(true)
+    @repository_transaction_primitive.should_receive(:respond_to?).any_number_of_times.with(:prepare).and_return(true)
     @repository_transaction_primitive.should_receive(:respond_to?).any_number_of_times.with(:rollback).and_return(true)
+    @repository_transaction_primitive.should_receive(:respond_to?).any_number_of_times.with(:rollback_prepared).and_return(true)
     @repository_transaction_primitive.should_receive(:respond_to?).any_number_of_times.with(:commit).and_return(true)
   end
 
@@ -135,6 +139,7 @@ describe DataMapper::Transaction do
       @transaction.should_receive(:each_adapter).with(:begin_adapter, [:rollback_and_close_adapter_if_begin, :close_adapter_if_none])
       @transaction.should_receive(:each_adapter).with(:rollback_adapter_if_begin, [:rollback_and_close_adapter_if_begin, :close_adapter_if_none])
       @transaction.should_receive(:each_adapter).with(:close_adapter_if_open, [:log_fatal_transaction_breakage])
+      @transaction.should_receive(:each_adapter).with(:rollback_prepared_adapter_if_prepare, [:rollback_prepared_and_close_adapter_if_begin, :close_adapter_if_none])
       @transaction.begin
       @transaction.rollback
     end
@@ -185,6 +190,7 @@ describe DataMapper::Transaction do
       it "should try to prepare each adapter (or rollback and close), then commit each adapter (or log fatal error), then close (or log fatal error)" do
         @transaction.should_receive(:each_adapter).with(:connect_adapter, [:log_fatal_transaction_breakage])
         @transaction.should_receive(:each_adapter).with(:begin_adapter, [:rollback_and_close_adapter_if_begin, :close_adapter_if_none])
+        @transaction.should_receive(:each_adapter).with(:prepare_adapter, [:rollback_and_close_adapter_if_begin, :rollback_prepared_and_close_adapter_if_prepare])
         @transaction.should_receive(:each_adapter).with(:commit_adapter, [:log_fatal_transaction_breakage])
         @transaction.should_receive(:each_adapter).with(:close_adapter, [:log_fatal_transaction_breakage])
         @transaction.begin
@@ -216,9 +222,11 @@ describe DataMapper::Transaction do
       end
       it "should begin, yield and commit if the block raises no exception" do
         @repository_transaction_primitive.should_receive(:begin)
+        @repository_transaction_primitive.should_receive(:prepare)
         @repository_transaction_primitive.should_receive(:commit)
         @repository_transaction_primitive.should_receive(:close)
         @transaction_primitive.should_receive(:begin)
+        @transaction_primitive.should_receive(:prepare)
         @transaction_primitive.should_receive(:commit)
         @transaction_primitive.should_receive(:close)
         p = Proc.new do end
@@ -449,9 +457,14 @@ describe DataMapper::Transaction do
       @transaction.should_receive(:do_adapter).with(@other_adapter, :begin, :none)
       @transaction.instance_eval do begin_adapter(a1) end
     end
-    it "should only allow adapters in state :begin to commit" do
+    it "should only allow adapters in state :begin to prepare" do
       a1 = @other_adapter
-      @transaction.should_receive(:do_adapter).with(@other_adapter, :commit, :begin)
+      @transaction.should_receive(:do_adapter).with(@other_adapter, :prepare, :begin)
+      @transaction.instance_eval do prepare_adapter(a1) end
+    end
+    it "should only allow adapters in state :prepare to commit" do
+      a1 = @other_adapter
+      @transaction.should_receive(:do_adapter).with(@other_adapter, :commit, :prepare)
       @transaction.instance_eval do commit_adapter(a1) end
     end
     it "should only allow adapters in state :begin to rollback" do
@@ -459,11 +472,22 @@ describe DataMapper::Transaction do
       @transaction.should_receive(:do_adapter).with(@other_adapter, :rollback, :begin)
       @transaction.instance_eval do rollback_adapter(a1) end
     end
+    it "should only allow adapters in state :prepare to rollback_prepared" do
+      a1 = @other_adapter
+      @transaction.should_receive(:do_adapter).with(@other_adapter, :rollback_prepared, :prepare)
+      @transaction.instance_eval do rollback_prepared_adapter(a1) end
+    end
     it "should do delegate properly for rollback_and_close" do
       a1 = @other_adapter
       @transaction.should_receive(:rollback_adapter).with(@other_adapter)
       @transaction.should_receive(:close_adapter).with(@other_adapter)
       @transaction.instance_eval do rollback_and_close_adapter(a1) end
     end
+    it "should do delegate properly for rollback_prepared_and_close" do
+      a1 = @other_adapter
+      @transaction.should_receive(:rollback_prepared_adapter).with(@other_adapter)
+      @transaction.should_receive(:close_adapter).with(@other_adapter)
+      @transaction.instance_eval do rollback_prepared_and_close_adapter(a1) end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rpbertp13-dm-core
 version: !ruby/object:Gem::Version 
-  version: 0.9.11.1
+  version: 0.9.11.2
 platform: ruby
 authors: 
 - Dan Kubb
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.10.0
+        version: 0.9.11
     version: 
 - !ruby/object:Gem::Dependency 
   name: extlib
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.0"
+        version: 2.0.2
     version: 
 description: Faster, Better, Simpler.
 email: