0
@@ -102,7 +102,7 @@ now? In DataMapper you control the mappings:
0
 
0
   class Fruit
0
     include DataMapper::Resource
0
-    set_table_name 'frt'
0
+    storage_names[:repo] = 'frt'
0
     property :name, String, :column => 'col2Name'
0
   end
0
 

0
@@ -152,20 +152,18 @@ module DataMapper
0
 
0
         connection = create_connection
0
         command = connection.create_command(sql)
0
-
0
         result = command.execute_non_query(*values)
0
 
0
-        close_connection(connection)
0
+        return false if result.to_i != 1
0
 
0
-        if result.to_i == 1
0
-          key = resource.class.key(name)
0
-          if key.size == 1 && (identity_field = key.first).serial?
0
-            resource.instance_variable_set(identity_field.instance_variable_name, result.insert_id)
0
-          end
0
-          true
0
-        else
0
-          false
0
+        key = resource.class.key(name)
0
+        if key.size == 1 && (identity_field = key.first).serial?
0
+          resource.instance_variable_set(identity_field.instance_variable_name, result.insert_id)
0
         end
0
+
0
+        true
0
+      ensure
0
+        close_connection(connection) if connection
0
       end
0
 
0
       def exists?(storage_name)
0
@@ -179,44 +177,43 @@ module DataMapper
0
         set = Collection.new(repository, resource, properties_with_indexes)
0
 
0
         sql = read_statement(resource, key)
0
-        DataMapper.logger.debug("READ: #{sql}")
0
+        DataMapper.logger.debug("READ: #{sql}  KEY: #{key.inspect}")
0
 
0
-        begin
0
-          connection = create_connection
0
-          command = connection.create_command(sql)
0
-          command.set_types(properties.map { |property| property.primitive })
0
-          reader = command.execute_reader(*key)
0
-          while(reader.next!)
0
-            set.load(reader.values)
0
-          end
0
-        ensure
0
-          reader.close if reader
0
-          close_connection(connection)
0
+        connection = create_connection
0
+        command = connection.create_command(sql)
0
+        command.set_types(properties.map { |property| property.primitive })
0
+        reader = command.execute_reader(*key)
0
+
0
+        while(reader.next!)
0
+          set.load(reader.values)
0
         end
0
 
0
         set.first
0
+      ensure
0
+        reader.close if reader
0
+        close_connection(connection) if connection
0
       end
0
 
0
       def update(repository, resource)
0
         properties = resource.dirty_attributes
0
 
0
-        if properties.empty?
0
-          return false
0
-        else
0
-          sql = update_statement(resource.class, properties)
0
-          values = properties.map { |property| resource.instance_variable_get(property.instance_variable_name) }
0
-          parameters = (values + resource.key)
0
-          DataMapper.logger.debug("UPDATE: #{sql}  PARAMETERS: #{parameters.inspect}")
0
+        return false if properties.empty?
0
+
0
+        sql = update_statement(resource.class, properties)
0
+        values = properties.map { |property| resource.instance_variable_get(property.instance_variable_name) }
0
+        parameters = (values + resource.key)
0
+        DataMapper.logger.debug("UPDATE: #{sql}  PARAMETERS: #{parameters.inspect}")
0
 
0
+        begin
0
           connection = create_connection
0
           command = connection.create_command(sql)
0
 
0
           affected_rows = command.execute_non_query(*parameters).to_i
0
-
0
-          close_connection(connection)
0
-
0
-          affected_rows == 1
0
+        ensure
0
+          close_connection(connection) if connection
0
         end
0
+
0
+        affected_rows == 1
0
       end
0
 
0
       def delete(repository, resource)
0
@@ -224,12 +221,11 @@ module DataMapper
0
 
0
         connection = create_connection
0
         command = connection.create_command(delete_statement(resource.class))
0
-
0
         affected_rows = command.execute_non_query(*key).to_i
0
 
0
-        close_connection(connection)
0
-
0
         affected_rows == 1
0
+      ensure
0
+        close_connection(connection) if connection
0
       end
0
 
0
       def create_model_storage(repository, model)
0
@@ -239,12 +235,11 @@ module DataMapper
0
 
0
         connection = create_connection
0
         command = connection.create_command(sql)
0
-
0
         result = command.execute_non_query
0
 
0
-        close_connection(connection)
0
-
0
         result.to_i == 1
0
+      ensure
0
+        close_connection(connection) if connection
0
       end
0
 
0
       def destroy_model_storage(repository, model)
0
@@ -254,12 +249,11 @@ module DataMapper
0
 
0
         connection = create_connection
0
         command = connection.create_command(sql)
0
-
0
         result = command.execute_non_query
0
 
0
-        close_connection(connection)
0
-
0
         result.to_i == 1
0
+      ensure
0
+        close_connection(connection) if connection
0
       end
0
 
0
       #
0
@@ -281,10 +275,11 @@ module DataMapper
0
         Collection.new(repository, model, properties_with_indexes) do |set|
0
           DataMapper.logger.debug("READ_SET: #{sql}  PARAMETERS: #{parameters.inspect}")
0
 
0
-          connection = create_connection
0
           begin
0
+            connection = create_connection
0
             command = connection.create_command(sql)
0
             command.set_types(properties.map { |property| property.primitive })
0
+
0
             reader = command.execute_reader(*parameters)
0
 
0
             while(reader.next!)
0
@@ -296,7 +291,7 @@ module DataMapper
0
             raise se
0
           ensure
0
             reader.close if reader
0
-            close_connection(connection)
0
+            close_connection(connection) if connection
0
           end
0
         end
0
       end
0
@@ -559,6 +554,7 @@ module DataMapper
0
         def equality_operator(query, model_name, operator, property, qualify, value)
0
           case value
0
             when Array             then "#{property_to_column_name(model_name, property, qualify)} IN ?"
0
+            when Range             then "#{property_to_column_name(model_name, property, qualify)} BETWEEN ?"
0
             when NilClass          then "#{property_to_column_name(model_name, property, qualify)} IS NULL"
0
             when DataMapper::Query then
0
               query.merge_sub_select_conditions(operator, property, value)
0
@@ -570,6 +566,7 @@ module DataMapper
0
         def inequality_operator(query, model_name, operator, property, qualify, value)
0
           case value
0
             when Array             then "#{property_to_column_name(model_name, property, qualify)} NOT IN ?"
0
+            when Range             then "#{property_to_column_name(model_name, property, qualify)} NOT BETWEEN ?"
0
             when NilClass          then "#{property_to_column_name(model_name, property, qualify)} IS NOT NULL"
0
             when DataMapper::Query then
0
               query.merge_sub_select_conditions(operator, property, value)

0
@@ -46,17 +46,15 @@ module DataMapper
0
           self
0
         end
0
 
0
-        alias << push
0
-
0
         def unshift(*resources)
0
           append_resource(resources)
0
           @children.unshift(*resources)
0
           self
0
         end
0
 
0
-        def clear
0
-          each { |resource| remove_resource(resource) }
0
-          @children.clear
0
+        def <<(resource)
0
+          append_resource([ resource ])
0
+          @children << resource
0
           self
0
         end
0
 
0
@@ -76,6 +74,12 @@ module DataMapper
0
           remove_resource(@children.delete_at(index))
0
         end
0
 
0
+        def clear
0
+          each { |resource| remove_resource(resource) }
0
+          @children.clear
0
+          self
0
+        end
0
+
0
         def save
0
           save_resources(@dirty_children)
0
           @dirty_children = []

0
@@ -7,33 +7,35 @@ module DataMapper
0
       model.extend ClassMethods
0
       DataMapper::AutoMigrator.models << model
0
     end
0
-    
0
+
0
     module ClassMethods
0
       def auto_migrate!(repository_name = default_repository_name)
0
-        self.relationships(repository_name).each_pair { |name, relationship| relationship.child_key }
0
-        repository(repository_name).adapter.destroy_model_storage(repository(repository_name), self)
0
-        repository(repository_name).adapter.create_model_storage(repository(repository_name), self)
0
+        repository(repository_name) do |r|
0
+          relationships(r.name).each_value { |relationship| relationship.child_key }
0
+          r.adapter.destroy_model_storage(r, self)
0
+          r.adapter.create_model_storage(r, self)
0
+        end
0
       end
0
     end
0
   end
0
-  
0
+
0
   class AutoMigrator
0
-    
0
+
0
     def self.models
0
       @@models ||= []
0
     end
0
-    
0
+
0
     def self.auto_migrate(repository_name)
0
       # First ensure that association keys are forced to load.
0
       models.each do |model|
0
-        model.relationships(repository_name).each_pair do |name, relationship|
0
+        model.relationships(repository_name).each_value do |relationship|
0
           relationship.child_key
0
         end
0
       end
0
-      
0
+
0
       models.each do |model|
0
         model.auto_migrate!(repository_name)
0
       end
0
     end
0
   end
0
-end # module DataMapper
0
\ No newline at end of file
0
+end # module DataMapper

0
@@ -6,7 +6,7 @@ module DataMapper
0
   end
0
   
0
   class DestructiveMigrator < Migrator
0
-    def self.migrate(repository)
0
+    def self.migrate(repository_name)
0
       models.each do |model|
0
         model.auto_migrate!
0
       end

0
@@ -18,9 +18,9 @@ module DataMapper
0
       end
0
     end
0
     
0
-    def self.migrate(repository)
0
+    def self.migrate(repository_name)
0
       subclasses.collect do |migrator|
0
-        migrator.migrate(repository)
0
+        migrator.migrate(repository_name)
0
       end.flatten
0
     end
0
   end

0
@@ -273,6 +273,11 @@ module DataMapper
0
     end
0
 
0
     def hash
0
+      if @custom && !@bound
0
+        @type.bind(self)
0
+        @bound = true
0
+      end
0
+      
0
       return @model.hash + @name.hash
0
     end
0
 
0
@@ -439,6 +444,7 @@ module DataMapper
0
 
0
       @model.auto_generate_validations(self) if @model.respond_to?(:auto_generate_validations)
0
       @model.property_serialization_setup(self) if @model.respond_to?(:property_serialization_setup)
0
+      
0
     end
0
 
0
     def determine_visibility # :nodoc:

0
@@ -14,6 +14,7 @@ module DataMapper
0
 
0
     def add(*properties)
0
       @entries.push(*properties)
0
+      properties.each { |property| property.hash }
0
       self
0
     end
0
 

0
@@ -102,11 +102,11 @@ module DataMapper
0
     end
0
     
0
     def migrate!
0
-      Migrator.migrate(self)
0
+      Migrator.migrate(name)
0
     end
0
     
0
     def auto_migrate!
0
-      AutoMigrator.auto_migrate(self)
0
+      AutoMigrator.auto_migrate(name)
0
     end
0
 
0
     #

0
@@ -5,10 +5,10 @@ module DataMapper
0
     attr_reader :transaction_primitives, :adapters, :state
0
 
0
     #
0
-    # Create a new DataMapper::Adapters::Transaction
0
+    # Create a new DataMapper::Transaction
0
     #
0
     # ==== Parameters
0
-    # See DataMapper::Adapters::Transaction#link
0
+    # See DataMapper::Transaction#link
0
     #
0
     # In fact, it just calls #link with the given arguments at the end of the constructor.
0
     #

0
@@ -149,6 +149,12 @@ module DataMapper
0
     def self.load(value, property)
0
       value
0
     end
0
+    
0
+    def self.bind(property)
0
+      # This method should not modify the state of this type class, and 
0
+      # should produce no side-effects on the type class. It's just a
0
+      # hook to allow your custom-type to modify the property it's bound to.
0
+    end
0
 
0
   end # class Type
0
 

0
@@ -2,3 +2,5 @@ dir = Pathname(__FILE__).dirname.expand_path / 'types'
0
 
0
 require dir / 'boolean'
0
 require dir / 'text'
0
+require dir / 'paranoid_datetime'
0
+require dir / 'paranoid_boolean'

0
@@ -0,0 +1,23 @@
0
+module DataMapper
0
+  module Types
0
+    class ParanoidBoolean < DataMapper::Type(Boolean)
0
+      primitive TrueClass
0
+      default   false
0
+
0
+      def self.bind(property)
0
+        model = property.model
0
+        repository = property.repository
0
+
0
+        model.class_eval <<-EOS
0
+          def destroy
0
+            attribute_set(#{property.name.inspect}, true)
0
+            save
0
+          end
0
+        EOS
0
+      
0
+        model.send(:scope_stack) << DataMapper::Query.new(repository, model, property.name => nil)
0
+        
0
+      end      
0
+    end
0
+  end
0
+end
0
\ No newline at end of file

0
@@ -0,0 +1,22 @@
0
+module DataMapper
0
+  module Types
0
+    class ParanoidDateTime < DataMapper::Type(DateTime)
0
+      primitive DateTime
0
+
0
+      def self.bind(property)
0
+        model = property.model
0
+        repository = property.repository
0
+
0
+        model.class_eval <<-EOS
0
+          def destroy
0
+            attribute_set(#{property.name.inspect}, DateTime::now)
0
+            save
0
+          end
0
+        EOS
0
+      
0
+        model.send(:scope_stack) << DataMapper::Query.new(repository, model, property.name => nil)
0
+        
0
+      end      
0
+    end
0
+  end
0
+end
0
\ No newline at end of file

0
@@ -124,6 +124,21 @@ begin
0
         yard.should respond_to(:engine)
0
         yard.should respond_to(:engine=)
0
       end
0
+      
0
+      it "#many_to_one with namespaced models" do
0
+        module FlightlessBirds
0
+          class Ostrich
0
+            include DataMapper::Resource
0
+            property :id, Fixnum, :serial => true
0
+            property :name, String
0
+            many_to_one :sky # there's something sad about this :'(
0
+          end
0
+        end
0
+        
0
+        FlightlessBirds::Ostrich.properties.slice(:sky_id).should_not be_empty
0
+        
0
+      end
0
+      
0
 
0
       it "should load the associated instance" do
0
         y = repository(:sqlite3).all(Yard, :id => 1).first

0
@@ -258,12 +258,6 @@ begin
0
           property :id, Fixnum, :serial => true
0
           property :name, String
0
           property :port, String
0
-
0
-          class << self
0
-            def property_by_name(name)
0
-              properties(repository.name)[name]
0
-            end
0
-          end
0
         end
0
 
0
         SailBoat.auto_migrate!(:postgres)
0
@@ -275,25 +269,25 @@ begin
0
 
0
       it "should order results" do
0
         result = repository(:postgres).all(SailBoat,{:order => [
0
-            DataMapper::Query::Direction.new(SailBoat.property_by_name(:name), :asc)
0
+            DataMapper::Query::Direction.new(SailBoat.properties[:name], :asc)
0
         ]})
0
         result[0].id.should == 1
0
 
0
         result = repository(:postgres).all(SailBoat,{:order => [
0
-            DataMapper::Query::Direction.new(SailBoat.property_by_name(:port), :asc)
0
+            DataMapper::Query::Direction.new(SailBoat.properties[:port], :asc)
0
         ]})
0
         result[0].id.should == 3
0
 
0
         result = repository(:postgres).all(SailBoat,{:order => [
0
-            DataMapper::Query::Direction.new(SailBoat.property_by_name(:name), :asc),
0
-            DataMapper::Query::Direction.new(SailBoat.property_by_name(:port), :asc)
0
+            DataMapper::Query::Direction.new(SailBoat.properties[:name], :asc),
0
+            DataMapper::Query::Direction.new(SailBoat.properties[:port], :asc)
0
         ]})
0
         result[0].id.should == 1
0
 
0
 
0
         result = repository(:postgres).all(SailBoat,{:order => [
0
-            SailBoat.property_by_name(:name),
0
-            DataMapper::Query::Direction.new(SailBoat.property_by_name(:port), :asc)
0
+            SailBoat.properties[:name],
0
+            DataMapper::Query::Direction.new(SailBoat.properties[:port], :asc)
0
         ]})
0
         result[0].id.should == 1
0
       end

0
@@ -87,12 +87,6 @@ begin
0
           property :notes, String, :lazy => [:notes]
0
           property :trip_report, String, :lazy => [:notes,:trip]
0
           property :miles, Fixnum, :lazy => [:trip]
0
-
0
-          class << self
0
-            def property_by_name(name)
0
-              properties(repository.name)[name]
0
-            end
0
-          end
0
         end
0
         
0
         SailBoat.auto_migrate!(:sqlite3)

0
@@ -17,12 +17,6 @@ begin
0
           property :id, Fixnum, :serial => true
0
           property :name, String
0
           property :port, String
0
-
0
-          class << self
0
-            def property_by_name(name)
0
-              properties(repository.name)[name]
0
-            end
0
-          end
0
         end
0
         
0
         SailBoat.auto_migrate!(:sqlite3)
0
@@ -46,24 +40,24 @@ begin
0
       
0
       it "should order results" do
0
         result = repository(:sqlite3).all(SailBoat,{:order => [
0
-              DataMapper::Query::Direction.new(SailBoat.property_by_name(:name), :asc)
0
+              DataMapper::Query::Direction.new(SailBoat.properties[:name], :asc)
0
             ]})
0
         result[0].id.should == 1
0
 
0
         result = repository(:sqlite3).all(SailBoat,{:order => [
0
-              DataMapper::Query::Direction.new(SailBoat.property_by_name(:port), :asc)
0
+              DataMapper::Query::Direction.new(SailBoat.properties[:port], :asc)
0
             ]})
0
         result[0].id.should == 3
0
 
0
         result = repository(:sqlite3).all(SailBoat,{:order => [
0
-              DataMapper::Query::Direction.new(SailBoat.property_by_name(:name), :asc),
0
-              DataMapper::Query::Direction.new(SailBoat.property_by_name(:port), :asc)
0
+              DataMapper::Query::Direction.new(SailBoat.properties[:name], :asc),
0
+              DataMapper::Query::Direction.new(SailBoat.properties[:port], :asc)
0
             ]})
0
         result[0].id.should == 1
0
 
0
         result = repository(:sqlite3).all(SailBoat,{:order => [
0
-              SailBoat.property_by_name(:name),
0
-              DataMapper::Query::Direction.new(SailBoat.property_by_name(:port), :asc)
0
+              SailBoat.properties[:name],
0
+              DataMapper::Query::Direction.new(SailBoat.properties[:port], :asc)
0
             ]})
0
         result[0].id.should == 1
0
 

0
@@ -85,6 +85,57 @@ begin
0
       end
0
     end
0
 
0
+    it "should respect paranoia with a datetime" do
0
+
0
+      class Lime
0
+        include DataMapper::Resource
0
+        property :id, Fixnum, :serial => true
0
+        property :color, String
0
+        property :deleted_at, DataMapper::Types::ParanoidDateTime
0
+      end
0
+