Sql

lib/motion_model.rb

@@ -1,6 +1,3 @@
-require 'motion-require'
-require 'motion-support'
-
-%w(*.rb model/*.rb adapters/*.rb).each do |path|
+%w(*.rb model/*.rb adapters/*.rb adapters/sql/sql_db_adapter.rb adapters/sql/sqlite3_adapter.rb adapters/sql/*.rb).each do |path|
   Motion::Require.all(Dir.glob(File.expand_path("../../motion/#{path}", __FILE__)))
 end

motion/adapters/sql/fmdb_adapter.rb

@@ -44,7 +44,7 @@ def execute_sql(sql)
           if rset
             result = []
             while rset.next do
-              result << rset.resultDictionary
+              result << rset.resultDict
             end
           end
         else

motion/adapters/sql/sql_condition.rb

@@ -49,6 +49,8 @@ def to_sql_str
         values = @value.map { |v| v.is_a?(Numeric) ? v : %Q["#{v}"] }
       elsif @value.is_a?(Range)
         values = [@value.min, @value.max]
+      elsif @value.is_a?(TrueClass) || @value.is_a?(FalseClass)
+        value = @value.to_i
       else
         value = %Q["#{@value}"]
       end

motion/adapters/sql/sql_db_adapter.rb

@@ -19,7 +19,7 @@ def log(sql, result)
 
     def execute
       result = @db_adapter.execute_sql(self)
-      log(@sql, result)
+      log(@sql, result) if RUBYMOTION_ENV == 'development'
       result
     end
   end

motion/adapters/sql/sql_model_adapter.rb

@@ -322,6 +322,15 @@ def get_loaded_attr(col)
         _col.type == :belongs_to? ? get_attr(name) : relation(_col).loaded
       end
 
+      def reload
+        _new_record = self.class.find(self.id)
+        if _new_record.present?
+          self.attributes = self.class.find(self.id).attributes
+        else
+          nil
+        end
+      end
+
       private
 
       def before_initialize(options)

motion/model/model.rb

@@ -533,9 +533,12 @@ def save_without_transaction(options = {})
     end
 
     # Set created_at and updated_at fields
+
     def set_auto_date_field(field_name)
       method = "#{field_name}="
-      self.send(method, Time.now) if self.respond_to?(method)
+      if self.respond_to?(method)
+        self.send(method, Time.now) if self.send(field_name).blank?
+      end
     end
 
     def hooks(name)
@@ -817,7 +820,8 @@ def unload_relation(col)
     end
 
     def initialize_data_columns(column, value) #nodoc
-      self.attributes = {column => value || self.class.default(column)}
+      _value = value.nil? ? self.class.default(column) : value
+      self.attributes = {column => _value}
     end
 
     def column_as(col) #nodoc

motion_model.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "motion_model"
   gem.require_paths = ["lib"]
-  gem.add_dependency 'bubble-wrap', '1.3.0'
+  gem.add_dependency 'bubble-wrap', '>= 1.3.0'
   gem.add_dependency 'motion-support', '>= 0.2.2'
   gem.version       = MotionModel::VERSION
 end