datamapper 0.2.2 → 0.2.3

data/plugins/dataobjects/do.rb

@@ -32,6 +32,14 @@ module DataObject
     def initialize(connection_string)
     end
     
+    def logger
+      @logger || @logger = Logger.new(nil)
+    end
+    
+    def logger=(value)
+      @logger = value
+    end
+    
     def begin_transaction
       # TODO: Hook this up
       Transaction.new
@@ -50,6 +58,7 @@ module DataObject
     end
     
     def create_command(text)
+      logger.debug { text }
       Command.new(self, text)
     end
     
@@ -215,11 +224,11 @@ module DataObject
       @connection, @text = connection, text
     end
     
-    def execute_non_query
+    def execute_non_query(*args)
       raise LostConnectionError, "the connection to the database has been lost" if @connection.closed?
     end
     
-    def execute_reader
+    def execute_reader(*args)
       raise LostConnectionError, "the connection to the database has been lost" if @connection.closed?
     end
     
@@ -227,6 +236,89 @@ module DataObject
       raise NotImplementedError
     end
     
+    # Escape a string of SQL with a set of arguments.
+    # The first argument is assumed to be the SQL to escape,
+    # the remaining arguments (if any) are assumed to be
+    # values to escape and interpolate.
+    #
+    # ==== Examples
+    #   escape_sql("SELECT * FROM zoos")
+    #   # => "SELECT * FROM zoos"
+    # 
+    #   escape_sql("SELECT * FROM zoos WHERE name = ?", "Dallas")
+    #   # => "SELECT * FROM zoos WHERE name = `Dallas`"
+    #
+    #   escape_sql("SELECT * FROM zoos WHERE name = ? AND acreage > ?", "Dallas", 40)
+    #   # => "SELECT * FROM zoos WHERE name = `Dallas` AND acreage > 40"
+    # 
+    # ==== Warning
+    # This method is meant mostly for adapters that don't support
+    # bind-parameters.
+    def escape_sql(args)
+      sql = text.dup
+    
+      unless args.empty?
+        sql.gsub!(/\?/) do |x|
+          quote_value(args.shift)
+        end
+      end
+      
+      sql
+    end
+    
+    def quote_value(value)
+      return 'NULL' if value.nil?
+
+      case value
+        when Numeric then quote_numeric(value)
+        when String then quote_string(value)
+        when Class then quote_class(value)
+        when Time then quote_time(value)
+        when DateTime then quote_datetime(value)
+        when Date then quote_date(value)
+        when TrueClass, FalseClass then quote_boolean(value)
+        when Array then quote_array(value)
+        else 
+          if value.respond_to?(:to_sql)
+            value.to_sql
+          else
+            raise "Don't know how to quote #{value.inspect}"
+          end
+      end
+    end
+    
+    def quote_numeric(value)
+      value.to_s
+    end
+    
+    def quote_string(value)
+      "'#{value.gsub("'", "''")}'"
+    end
+    
+    def quote_class(value)
+      "'#{value.name}'"
+    end
+    
+    def quote_time(value)
+      "'#{value.xmlschema}'"
+    end
+    
+    def quote_datetime(value)
+      "'#{value.dup}'"
+    end
+    
+    def quote_date(value)
+      "'#{value.strftime("%Y-%m-%d")}'"
+    end
+    
+    def quote_boolean(value)
+      value.to_s.upcase
+    end
+    
+    def quote_array(value)
+      "(#{value.map { |entry| quote_value(entry) }.join(', ')})"
+    end
+    
   end
   
   class NotImplementedError < StandardError

data/plugins/dataobjects/do_mysql.rb

@@ -10,21 +10,9 @@ module DataObject
     
     class Connection < DataObject::Connection
       
-      def self.conns
-        @conns
-      end
-      
-      def self.conns=(val)
-        @conns = val
-      end
-      
-      self.conns = 0
-      
       attr_reader :db
       
-      def initialize(connection_string)
-        @num = (self.class.conns += 1)
-        
+      def initialize(connection_string)        
         @state = STATE_CLOSED
         @connection_string = connection_string
         opts = connection_string.split(" ")
@@ -60,6 +48,7 @@ module DataObject
       end
       
       def create_command(text)
+        logger.debug { text }
         Command.new(self, text)
       end
       
@@ -180,9 +169,9 @@ module DataObject
     
     class Command < DataObject::Command
       
-      def execute_reader
+      def execute_reader(*args)
         super
-        result = Mysql_c.mysql_query(@connection.db, @text)
+        result = Mysql_c.mysql_query(@connection.db, escape_sql(args))
         # TODO: Real Error
         raise QueryError, "Your query failed.\n#{Mysql_c.mysql_error(@connection.db)}\n#{@text}" unless result == 0
         reader = Reader.new(@connection.db, Mysql_c.mysql_use_result(@connection.db))
@@ -195,9 +184,9 @@ module DataObject
         end
       end
       
-      def execute_non_query
+      def execute_non_query(*args)
         super
-        result = Mysql_c.mysql_query(@connection.db, @text)
+        result = Mysql_c.mysql_query(@connection.db, escape_sql(args))
         raise QueryError, "Your query failed.\n#{Mysql_c.mysql_error(@connection.db)}\n#{@text}" unless result == 0         
         reader = Mysql_c.mysql_store_result(@connection.db)
         raise QueryError, "You called execute_non_query on a query: #{@text}" if reader
@@ -206,6 +195,17 @@ module DataObject
         return ResultData.new(@connection, rows_affected, Mysql_c.mysql_insert_id(@connection.db))
       end
       
+      def quote_time(value)
+        "DATE('#{value.xmlschema}')"
+      end
+      
+      def quote_datetime(value)
+        "DATE('#{value}')"
+      end
+      
+      def quote_date(value)
+        "DATE('#{value.strftime("%Y-%m-%d")}')"
+      end
     end
     
   end

data/plugins/dataobjects/do_postgres.rb

@@ -60,10 +60,8 @@ module DataObject
         end
       end
       
-      def close
+      def real_close
         Postgres_c.PQclear(@reader)
-        @state = STATE_CLOSED
-        true
       end
       
       def data_type_name(col)
@@ -91,6 +89,15 @@ module DataObject
         typecast(val, @field_types[idx])
       end
       
+      def each
+        return unless has_rows?
+        
+        while(true) do
+          yield
+          break unless self.next
+        end
+      end
+      
       def next
         super   
         if @cursor >= @rows - 1
@@ -117,11 +124,11 @@ module DataObject
           when "FLOAT4", "FLOAT8", "NUMERIC", "CASH"
             val.to_f
           when "TIMESTAMP", "TIMETZ", "TIMESTAMPTZ"
-            DateTime.parse(val)
+            DateTime.parse(val) rescue nil
           when "TIME"
-            DateTime.parse(val).to_time
+            DateTime.parse(val).to_time rescue nil
           when "DATE"
-            Date.parse(val)
+            Date.parse(val) rescue nil
           else
             val
         end
@@ -146,25 +153,37 @@ module DataObject
     
     class Command < DataObject::Command
       
-      def execute_reader
+      def execute_reader(*args)
         super
-        reader = Postgres_c.PQexec(@connection.db, @text)
-        unless [Postgres_c::PGRES_COMMAND_OK, Postgres_c::PGRES_TUPLES_OK].include?(Postgres_c.PQresultStatus(reader))
-          raise QueryError, "Your query failed.\n#{Postgres_c.PQerrorMessage(@connection.db)}QUERY: \"#{@text}\""
+        sql = escape_sql(args)
+        @connection.logger.debug { sql }
+        ptr = Postgres_c.PQexec(@connection.db, sql)
+        unless [Postgres_c::PGRES_COMMAND_OK, Postgres_c::PGRES_TUPLES_OK].include?(Postgres_c.PQresultStatus(ptr))
+          raise QueryError, "Your query failed.\n#{Postgres_c.PQerrorMessage(@connection.db)}QUERY: \"#{sql}\""
+        else
+          reader = Reader.new(@connection.db, ptr)
+          if block_given?
+            return_value = yield(reader)
+            reader.close
+            return_value
+          else
+            reader
+          end
         end
-        Reader.new(@connection.db, reader)
       end
       
-      def execute_non_query
+      def execute_non_query(*args)
         super
-        results = Postgres_c.PQexec(@connection.db, @text)
+        sql = escape_sql(args)
+        @connection.logger.debug { sql }
+        results = Postgres_c.PQexec(@connection.db, sql)
         status = Postgres_c.PQresultStatus(results)
         if status == Postgres_c::PGRES_TUPLES_OK
           Postgres_c.PQclear(results)
-          raise QueryError, "Your query failed or you tried to execute a SELECT query through execute_non_reader\n#{Postgres_c.PQerrorMessage(@connection.db)}\nQUERY: \"#{@text}\""
+          raise QueryError, "Your query failed or you tried to execute a SELECT query through execute_non_reader\n#{Postgres_c.PQerrorMessage(@connection.db)}\nQUERY: \"#{sql}\""
         elsif status != Postgres_c::PGRES_COMMAND_OK
           Postgres_c.PQclear(results)
-          raise QueryError, "Your query failed.\n#{Postgres_c.PQerrorMessage(@connection.db)}\nQUERY: \"#{@text}\""
+          raise QueryError, "Your query failed.\n#{Postgres_c.PQerrorMessage(@connection.db)}\nQUERY: \"#{sql}\""
         end
         rows_affected = Postgres_c.PQcmdTuples(results).to_i
         Postgres_c.PQclear(results)

data/plugins/dataobjects/do_sqlite3.rb

@@ -35,6 +35,7 @@ module DataObject
       end
       
       def create_command(text)
+        logger.debug { text }
         Command.new(self, text)
       end
       
@@ -113,11 +114,12 @@ module DataObject
     
     class Command < DataObject::Command
       
-      def execute_reader
+      def execute_reader(*args)
         super
-        result, ptr = Sqlite3_c.sqlite3_prepare_v2(@connection.db, @text, @text.size + 1)
+        sql = escape_sql(args)
+        result, ptr = Sqlite3_c.sqlite3_prepare_v2(@connection.db, sql, sql.size + 1)
         unless result == Sqlite3_c::SQLITE_OK
-          raise QueryError, "Your query failed.\n#{Sqlite3_c.sqlite3_errmsg(@connection.db)}\nQUERY: \"#{@text}\""
+          raise QueryError, "Your query failed.\n#{Sqlite3_c.sqlite3_errmsg(@connection.db)}\nQUERY: \"#{sql}\""
         else
           reader = Reader.new(@connection.db, ptr)
           
@@ -131,12 +133,13 @@ module DataObject
         end
       end
       
-      def execute_non_query
+      def execute_non_query(*args)
         super
-        result, reader = Sqlite3_c.sqlite3_prepare_v2(@connection.db, @text, -1)
+        sql = escape_sql(args)
+        result, reader = Sqlite3_c.sqlite3_prepare_v2(@connection.db, sql, -1)
         unless result == Sqlite3_c::SQLITE_OK
           Sqlite3_c.sqlite3_finalize(reader)
-          raise QueryError, "Your query failed.\n#{Sqlite3_c.sqlite3_errmsg(@connection.db)}\nQUERY: \"#{@text}\""
+          raise QueryError, "Your query failed.\n#{Sqlite3_c.sqlite3_errmsg(@connection.db)}\nQUERY: \"#{sql}\""
         else
           exec_result = Sqlite3_c.sqlite3_step(reader)
           Sqlite3_c.sqlite3_finalize(reader)

data/rakefile.rb

@@ -37,7 +37,7 @@ namespace :dm do
 
 end
 
-PACKAGE_VERSION = '0.2.2'
+PACKAGE_VERSION = '0.2.3'
 
 PACKAGE_FILES = FileList[
   'README',
@@ -48,7 +48,7 @@ PACKAGE_FILES = FileList[
   'spec/**/*.{rb,yaml}',
   'tasks/**/*',
   'plugins/**/*'
-].to_a.reject { |path| path =~ /\.(bundle|log)$/ }
+].to_a.reject { |path| path =~ /(\/db|Makefile|\.bundle|\.log|\.o)$/ }
 
 DOCUMENTED_FILES = PACKAGE_FILES.reject do |path|
   FileTest.directory?(path) || path =~ /(^spec|\/spec|\/swig\_)/
@@ -86,6 +86,7 @@ gem_spec = Gem::Specification.new do |s|
   s.requirements << 'none'
   s.autorequire = 'data_mapper'
   s.add_dependency('fastthread')
+  s.add_dependency('rspec')
 
   s.has_rdoc = true 
   s.rdoc_options << '--line-numbers' << '--inline-source' << '--main' << 'README'

data/spec/base_spec.rb

@@ -18,6 +18,34 @@ describe DataMapper::Base do
     a.test.should == 'testing!'
   end
   
+  it "should be dirty" do
+    x = Person.create(:name => 'a')
+    x.should_not be_dirty
+    x.name = 'dslfay'
+    x.should be_dirty
+  end
+  
+  it "should return a diff" do
+    x = Person.new(:name => 'Sam', :age => 30, :occupation => 'Programmer')
+    y = Person.new(:name => 'Amy', :age => 21, :occupation => 'Programmer')
+    
+    diff = (x ^ y)
+    diff.should include(:name)
+    diff.should include(:age)
+    diff[:name].should eql(['Sam', 'Amy'])
+    diff[:age].should eql([30, 21])
+    
+    x.destroy!
+    y.destroy!
+  end
+  
+  it "should update attributes" do
+    x = Person.create(:name => 'Sam')
+    x.update_attributes(:age => 30).should eql(true)
+    x.age.should eql(30)
+    x.should_not be_dirty
+  end 
+  
 end
 
 describe 'A new record' do

data/spec/dataobjects_spec.rb

@@ -15,7 +15,8 @@ describe DataObject do
   #     SELECT * FROM tbl WHERE auto IS NULL;
   it "should return an empty reader" do
     database.adapter.connection do |connection|
-      command = connection.create_command('SELECT `id`, `name` FROM `zoos` WHERE (`id` IS NULL)')
+      sql = 'SELECT `id`, `name` FROM `zoos` WHERE (`id` IS NULL)'.gsub(/\`/, database.adapter.class::COLUMN_QUOTING_CHARACTER)
+      command = connection.create_command(sql)
 
       command.execute_reader do |reader|
         reader.has_rows?.should eql(ENV['ADAPTER'] == 'mysql')

data/spec/load_command_spec.rb

@@ -104,7 +104,7 @@ describe DataMapper::Adapters::Sql::Commands::LoadCommand do
    end
 
    it 'non-standard options should be considered part of the conditions' do
-     database.log.debug { 'non-standard options should be considered part of the conditions' }
+     database.logger.debug { 'non-standard options should be considered part of the conditions' }
      zebra = Animal.first(:name => 'Zebra')
      zebra.name.should == 'Zebra'
 

data/spec/serialization_spec.rb

@@ -29,7 +29,7 @@ describe DataMapper::Support::Serialization do
       <zoo id="2">
         <name>San Diego</name>
         <notes/>
-        <updated_at>#{san_diego_zoo.updated_at}</updated_at>
+        <updated_at>#{san_diego_zoo.updated_at.dup}</updated_at>
       </zoo>
     EOS
   end
@@ -50,7 +50,7 @@ describe DataMapper::Support::Serialization do
         "id": 2,
         "name": "San Diego",
         "notes": null,
-        "updated_at": #{san_diego_zoo.updated_at.to_json}
+        "updated_at": #{san_diego_zoo.updated_at.dup.to_json}
       }
     EOS
   end

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ def fixtures(name)
   entry = YAML::load_file(File.dirname(__FILE__) + "/fixtures/#{name}.yaml")
   klass = Kernel::const_get(Inflector.classify(Inflector.singularize(name)))
   
-  database.log.debug { "AUTOMIGRATE: #{klass}" }
+  database.logger.debug { "AUTOMIGRATE: #{klass}" }
   klass.auto_migrate!
   
   (entry.kind_of?(Array) ? entry : [entry]).each do |hash|

data/spec/support_spec.rb

@@ -0,0 +1,7 @@
+describe DataMapper::Support do
+  
+  it "a String should translate" do
+    "%s is great!".t('DataMapper').should eql("DataMapper is great!")
+  end
+  
+end