upsert 1.0.2 → 1.1.0

data/lib/upsert/binary.rb

@@ -2,5 +2,7 @@ class Upsert
   # A wrapper class for binary strings so that Upsert knows to escape them as such.
   #
   # Create them with +Upsert.binary(x)+
+  #
+  # @private
   Binary = Struct.new(:value)
 end

data/lib/upsert/column_definition.rb

@@ -8,6 +8,8 @@ class Upsert
       end
     end
 
+    TIME_DETECTOR = /date|time/i
+
     attr_reader :name
     attr_reader :sql_type
     attr_reader :default
@@ -18,6 +20,7 @@ class Upsert
     def initialize(connection, name, sql_type, default)
       @name = name
       @sql_type = sql_type
+      @temporal_query = !!(sql_type =~ TIME_DETECTOR)
       @default = default
       @quoted_name = connection.quote_ident name
       @quoted_selector_name = connection.quote_ident "#{name}_sel"
@@ -25,19 +28,40 @@ class Upsert
     end
 
     def to_selector_arg
-      "#{quoted_selector_name} #{sql_type}"
+      "#{quoted_selector_name} #{arg_type}"
     end
 
     def to_setter_arg
-      "#{quoted_setter_name} #{sql_type}"
+      "#{quoted_setter_name} #{arg_type}"
     end
 
     def to_setter
-      "#{quoted_name} = #{quoted_setter_name}"
+      "#{quoted_name} = #{to_setter_value}"
     end
 
     def to_selector
       "#{quoted_name} = #{quoted_selector_name}"
     end
+
+    def temporal?
+      @temporal_query
+    end
+
+    def arg_type
+      if temporal?
+        'character varying(255)'
+      else
+        sql_type
+      end
+    end
+
+    def to_setter_value
+      if temporal?
+        "CAST(#{quoted_setter_name} AS #{sql_type})"
+      else
+        quoted_setter_name
+      end
+    end
+
   end
 end

data/lib/upsert/column_definition/mysql.rb

@@ -0,0 +1,20 @@
+class Upsert
+  class ColumnDefinition
+    # @private
+    class Mysql < ColumnDefinition
+      class << self
+        def all(connection, table_name)
+          connection.execute("SHOW COLUMNS FROM #{connection.quote_ident(table_name)}").map do |row|
+            # {"Field"=>"name", "Type"=>"varchar(255)", "Null"=>"NO", "Key"=>"PRI", "Default"=>nil, "Extra"=>""}
+            name = row['Field'] || row['COLUMN_NAME']
+            type = row['Type'] || row['COLUMN_TYPE']
+            default = row['Default'] || row['COLUMN_DEFAULT']
+            new connection, name, type, default
+          end.sort_by do |cd|
+            cd.name
+          end
+        end
+      end
+    end
+  end
+end

data/lib/upsert/column_definition/{PG_Connection.rb → postgresql.rb}

@@ -1,7 +1,7 @@
 class Upsert
   class ColumnDefinition
     # @private
-    class PG_Connection < ColumnDefinition
+    class Postgresql < ColumnDefinition
       class << self
         # activerecord-3.2.5/lib/active_record/connection_adapters/postgresql_adapter.rb#column_definitions
         def all(connection, table_name)

data/lib/upsert/connection.rb

@@ -2,36 +2,34 @@ class Upsert
   # @private
   class Connection
     attr_reader :controller
-    attr_reader :raw_connection
+    attr_reader :metal
 
-    def initialize(controller, raw_connection)
+    def initialize(controller, metal)
       @controller = controller
-      @raw_connection = raw_connection
+      @metal = metal
     end
-    
-    def quote_value(v)
+
+    def convert_binary(bind_values)
+      bind_values.map do |v|
+        case v
+        when Upsert::Binary
+          binary v
+        else
+          v
+        end
+      end
+    end
+
+    def bind_value(v)
       case v
-      when NilClass
-        NULL_WORD
-      when Upsert::Binary
-        quote_binary v.value # must be defined by base
-      when String
-        quote_string v # must be defined by base
-      when TrueClass, FalseClass
-        quote_boolean v
-      when BigDecimal
-        quote_big_decimal v
-      when Numeric
-        v
-      when Symbol
-        quote_string v.to_s
       when Time, DateTime
-        quote_time v # must be defined by base
+        Upsert.utc_iso8601 v
       when Date
-        quote_string v.strftime(ISO8601_DATE)
+        v.strftime ISO8601_DATE
       else
-        raise "not sure how to quote #{v.class}: #{v.inspect}"
+        v
       end
     end
+
   end
 end

data/lib/upsert/connection/Java_ComMysqlJdbc_JDBC4Connection.rb

@@ -0,0 +1,25 @@
+require 'upsert/connection/jdbc'
+
+class Upsert
+  class Connection
+    # @private
+    class Java_ComMysqlJdbc_JDBC4Connection < Connection
+      include Jdbc
+
+      # ? backtick?
+      def quote_ident(k)
+        DOUBLE_QUOTE + k.to_s.gsub(DOUBLE_QUOTE, '""') + DOUBLE_QUOTE
+      end
+
+      def bind_value(v)
+        case v
+        when Time, DateTime
+          # mysql doesn't like it when you send timezone to a datetime
+          Upsert.utc_iso8601 v, false
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/upsert/connection/Java_OrgPostgresqlJdbc4_Jdbc4Connection.rb

@@ -0,0 +1,14 @@
+require 'upsert/connection/jdbc'
+
+class Upsert
+  class Connection
+    # @private
+    class Java_OrgPostgresqlJdbc4_Jdbc4Connection < Connection
+      include Jdbc
+
+      def quote_ident(k)
+        DOUBLE_QUOTE + k.to_s.gsub(DOUBLE_QUOTE, '""') + DOUBLE_QUOTE
+      end
+    end
+  end
+end

data/lib/upsert/connection/Java_OrgSqliteConn.rb

@@ -0,0 +1,17 @@
+require 'upsert/connection/jdbc'
+require 'upsert/connection/sqlite3'
+
+class Upsert
+  class Connection
+    # @private
+    class Java_OrgSqliteConn < Connection
+      include Jdbc
+      include Sqlite3
+
+      # ?
+      def quote_ident(k)
+        DOUBLE_QUOTE + k.to_s.gsub(DOUBLE_QUOTE, '""') + DOUBLE_QUOTE
+      end
+    end
+  end
+end

data/lib/upsert/connection/Mysql2_Client.rb

@@ -4,7 +4,42 @@ class Upsert
     class Mysql2_Client < Connection
       def execute(sql)
         Upsert.logger.debug { %{[upsert] #{sql}} }
-        raw_connection.query sql
+        if results = metal.query(sql)
+          rows = []
+          results.each { |row| rows << row }
+          if rows[0].is_a? Array
+            # you don't know if mysql2 is going to give you an array or a hash... and you shouldn't specify, because it's sticky
+            fields = results.fields
+            rows.map { |row| Hash[fields.zip(row)] }
+          else
+            rows
+          end
+        end
+      end
+
+      def quote_value(v)
+        case v
+        when NilClass
+          NULL_WORD
+        when Upsert::Binary
+          quote_binary v.value
+        when String
+          quote_string v
+        when TrueClass, FalseClass
+          quote_boolean v
+        when BigDecimal
+          quote_big_decimal v
+        when Numeric
+          v
+        when Symbol
+          quote_string v.to_s
+        when DateTime, Time
+          quote_string Upsert.utc_iso8601(v) #round?
+        when Date
+          quote_date v
+        else
+          raise "not sure how to quote #{v.class}: #{v.inspect}"
+        end
       end
 
       def quote_boolean(v)
@@ -12,7 +47,7 @@ class Upsert
       end
 
       def quote_string(v)
-        SINGLE_QUOTE + raw_connection.escape(v) + SINGLE_QUOTE
+        SINGLE_QUOTE + metal.escape(v) + SINGLE_QUOTE
       end
 
       # This doubles the size of the representation.
@@ -24,30 +59,17 @@ class Upsert
       # might work if we could get the encoding issues fixed when joining together the values for the sql
       # alias_method :quote_binary, :quote_string
 
-      def quote_time(v)
-        quote_string v.strftime(ISO8601_DATETIME)
+      def quote_date(v)
+        quote_string v.strftime(ISO8601_DATE)
       end
 
       def quote_ident(k)
-        BACKTICK + raw_connection.escape(k.to_s) + BACKTICK
+        BACKTICK + metal.escape(k.to_s) + BACKTICK
       end
 
       def quote_big_decimal(v)
         v.to_s('F')
       end
-
-      def database_variable_get(k)
-        sql = "SHOW VARIABLES LIKE '#{k}'"
-        row = execute(sql).first
-        case row
-        when Array
-          row[1]
-        when Hash
-          row['Value']
-        else
-          raise "Don't know what to do if connection.query returns a #{row.class}"
-        end
-      end
     end
   end
 end

data/lib/upsert/connection/PG_Connection.rb

@@ -5,15 +5,19 @@ class Upsert
       def execute(sql, params = nil)
         if params
           Upsert.logger.debug { %{[upsert] #{sql} with #{params.inspect}} }
-          raw_connection.exec sql, params
+          metal.exec sql, convert_binary(params)
         else
           Upsert.logger.debug { %{[upsert] #{sql}} }
-          raw_connection.exec sql
+          metal.exec sql
         end
       end
 
       def quote_ident(k)
-        raw_connection.quote_ident k.to_s
+        metal.quote_ident k.to_s
+      end
+
+      def binary(v)
+        { :value => v.value, :format => 1 }
       end
     end
   end

data/lib/upsert/connection/SQLite3_Database.rb

@@ -1,20 +1,28 @@
+require 'upsert/connection/sqlite3'
+
 class Upsert
   class Connection
     # @private
     class SQLite3_Database < Connection
+      include Sqlite3
+
       def execute(sql, params = nil)
         if params
           Upsert.logger.debug { %{[upsert] #{sql} with #{params.inspect}} }
-          raw_connection.execute sql, params
+          metal.execute sql, convert_binary(params)
         else
           Upsert.logger.debug { %{[upsert] #{sql}} }
-          raw_connection.execute sql
+          metal.execute sql
         end
       end
       
       def quote_ident(k)
         DOUBLE_QUOTE + SQLite3::Database.quote(k.to_s) + DOUBLE_QUOTE
       end
+
+      def binary(v)
+        SQLite3::Blob.new v.value
+      end
     end
   end
 end

data/lib/upsert/connection/jdbc.rb

@@ -0,0 +1,81 @@
+class Upsert
+  class Connection
+    # @private
+    module Jdbc
+      # /Users/seamusabshere/.rvm/gems/jruby-head/gems/activerecord-jdbc-adapter-1.2.2.1/src/java/arjdbc/jdbc/RubyJdbcConnection.java
+      GETTER = {
+        java.sql.Types::VARCHAR     => 'getString',
+        java.sql.Types::OTHER       => 'getString', # ?! i guess unicode text?
+        java.sql.Types::BINARY      => 'getBlob',
+        java.sql.Types::LONGVARCHAR => 'getString',
+      }
+      java.sql.Types.constants.each do |type_name|
+        i = java.sql.Types.const_get type_name
+        unless GETTER.has_key?(i)
+          GETTER[i] = 'get' + type_name[0].upcase + type_name[1..-1].downcase
+        end
+      end
+      SETTER = Hash.new do |hash, k|
+        hash[k] = 'set' + k
+      end.merge(
+        'TrueClass'  => 'setBoolean',
+        'FalseClass' => 'setBoolean',
+        'Fixnum'     => 'setInt',
+      )
+
+      def binary(v)
+        v.value.to_java_bytes.java_object
+      end
+
+      def execute(sql, params = nil)
+        has_result = if params
+          Upsert.logger.debug { %{[upsert] #{sql} with #{params.inspect}} }
+          setters = self.class.const_get(:SETTER)
+          statement = metal.prepareStatement sql
+          params.each_with_index do |v, i|
+            case v
+            when Upsert::Binary
+              statement.setBytes i+1, binary(v)
+            when BigDecimal
+              statement.setBigDecimal i+1, java.math.BigDecimal.new(v.to_s)
+            when NilClass
+              # http://stackoverflow.com/questions/4243513/why-does-preparedstatement-setnull-requires-sqltype
+              statement.setObject i+1, nil
+            else
+              setter = setters[v.class.name]
+              statement.send setter, i+1, v
+            end
+          end
+          statement.execute
+        else
+          Upsert.logger.debug { %{[upsert] #{sql}} }
+          statement = metal.createStatement
+          statement.execute sql
+        end
+        if not has_result
+          statement.close
+          return
+        end
+        getters = self.class.const_get(:GETTER)
+        raw_result = statement.getResultSet
+        meta = raw_result.getMetaData
+        count = meta.getColumnCount
+        column_name_and_getter = (1..count).inject({}) do |memo, i|
+          memo[i] = [ meta.getColumnName(i), getters[meta.getColumnType(i)] ]
+          memo
+        end
+        result = []
+        while raw_result.next
+          row = {}
+          column_name_and_getter.each do |i, cg|
+            column_name, getter = cg
+            row[column_name] = raw_result.send(getter, i)
+          end
+          result << row
+        end
+        statement.close
+        result
+      end
+    end
+  end
+end

data/lib/upsert/connection/sqlite3.rb

@@ -0,0 +1,23 @@
+class Upsert
+  class Connection
+    # @private
+    module Sqlite3
+      def bind_value(v)
+        case v
+        when BigDecimal
+          v.to_s('F')
+        when TrueClass
+          't'
+        when FalseClass
+          'f'
+        when Time, DateTime
+          Upsert.utc_iso8601 v
+        when Date
+          v.strftime ISO8601_DATE
+        else
+          v
+        end
+      end
+    end
+  end
+end