plugins/dataobjects/do.rb in datamapper-0.2.2 vs plugins/dataobjects/do.rb in datamapper-0.2.3

@@ -30,10 +30,18 @@
     attr_reader :timeout, :database, :datasource, :server_version, :state
     
     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
     end
     
@@ -48,10 +56,11 @@
     def close
       raise NotImplementedError
     end
     
     def create_command(text)
+      logger.debug { text }
       Command.new(self, text)
     end
     
     def closed?
       @state == STATE_CLOSED
@@ -213,19 +222,102 @@
     # initialize creates a new Command object
     def initialize(connection, text)
       @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
     
     def prepare
       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
\ No newline at end of file