upsert 1.0.2 → 1.1.0

data/spec/type_safety_spec.rb

@@ -5,7 +5,7 @@ describe Upsert do
       upsert = Upsert.new $conn, :pets
       lambda do
         upsert.row :tag_number => ''
-      end.should raise_error(PG::Error, /invalid input syntax/)
+      end.should raise_error
     end
   end
-end if ENV['ADAPTER'] == 'postgresql'
+end if ENV['DB'] == 'postgresql'

data/upsert.gemspec

@@ -16,23 +16,35 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Upsert::VERSION
 
-  gem.add_development_dependency 'posix-spawn'
+  # NOTE: no runtime dependencies!
+
   gem.add_development_dependency 'rspec-core'
   gem.add_development_dependency 'rspec-expectations'
   gem.add_development_dependency 'rspec-mocks'
 
-  gem.add_development_dependency 'sqlite3'
-  gem.add_development_dependency 'mysql2'
-  gem.add_development_dependency 'pg'
-  gem.add_development_dependency 'activerecord' # testing only
+  gem.add_development_dependency 'activerecord'
   gem.add_development_dependency 'active_record_inline_schema'
   gem.add_development_dependency 'faker'
   gem.add_development_dependency 'yard'
-  gem.add_development_dependency 'redcarpet' # github-flavored markdown
   gem.add_development_dependency 'activerecord-import'
   gem.add_development_dependency 'pry'
 
   unless RUBY_VERSION >= '1.9'
     gem.add_development_dependency 'orderedhash'
   end
+
+  if RUBY_PLATFORM == 'java'
+    gem.add_development_dependency 'jruby-openssl'
+    gem.add_development_dependency 'jdbc-postgres'
+    gem.add_development_dependency 'jdbc-mysql'
+    gem.add_development_dependency 'jdbc-sqlite3'
+    gem.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
+    gem.add_development_dependency 'activerecord-jdbcmysql-adapter'
+    gem.add_development_dependency 'activerecord-jdbcpostgresql-adapter'
+  else
+    gem.add_development_dependency 'sqlite3'
+    gem.add_development_dependency 'mysql2'
+    gem.add_development_dependency 'pg'
+    gem.add_development_dependency 'redcarpet' # github-flavored markdown
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upsert
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: posix-spawn
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
@@ -76,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: active_record_inline_schema
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -108,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: faker
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -124,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -140,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: active_record_inline_schema
+  name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -156,7 +140,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faker
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -172,7 +156,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -188,7 +172,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -204,7 +188,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord-import
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -220,7 +204,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -253,26 +237,29 @@ files:
 - lib/upsert.rb
 - lib/upsert/active_record_upsert.rb
 - lib/upsert/binary.rb
-- lib/upsert/cell.rb
-- lib/upsert/cell/Mysql2_Client.rb
-- lib/upsert/cell/PG_Connection.rb
-- lib/upsert/cell/SQLite3_Database.rb
 - lib/upsert/column_definition.rb
-- lib/upsert/column_definition/Mysql2_Client.rb
-- lib/upsert/column_definition/PG_Connection.rb
-- lib/upsert/column_definition/SQLite3_Database.rb
+- lib/upsert/column_definition/mysql.rb
+- lib/upsert/column_definition/postgresql.rb
 - lib/upsert/connection.rb
+- lib/upsert/connection/Java_ComMysqlJdbc_JDBC4Connection.rb
+- lib/upsert/connection/Java_OrgPostgresqlJdbc4_Jdbc4Connection.rb
+- lib/upsert/connection/Java_OrgSqliteConn.rb
 - lib/upsert/connection/Mysql2_Client.rb
 - lib/upsert/connection/PG_Connection.rb
 - lib/upsert/connection/SQLite3_Database.rb
+- lib/upsert/connection/jdbc.rb
+- lib/upsert/connection/sqlite3.rb
 - lib/upsert/merge_function.rb
+- lib/upsert/merge_function/Java_ComMysqlJdbc_JDBC4Connection.rb
+- lib/upsert/merge_function/Java_OrgPostgresqlJdbc4_Jdbc4Connection.rb
+- lib/upsert/merge_function/Java_OrgSqliteConn.rb
 - lib/upsert/merge_function/Mysql2_Client.rb
 - lib/upsert/merge_function/PG_Connection.rb
 - lib/upsert/merge_function/SQLite3_Database.rb
+- lib/upsert/merge_function/mysql.rb
+- lib/upsert/merge_function/postgresql.rb
+- lib/upsert/merge_function/sqlite3.rb
 - lib/upsert/row.rb
-- lib/upsert/row/Mysql2_Client.rb
-- lib/upsert/row/PG_Connection.rb
-- lib/upsert/row/SQLite3_Database.rb
 - lib/upsert/version.rb
 - spec/active_record_upsert_spec.rb
 - spec/binary_spec.rb

data/lib/upsert/cell.rb

@@ -1,5 +0,0 @@
-class Upsert
-  # @private
-  class Cell
-  end
-end

data/lib/upsert/cell/Mysql2_Client.rb

@@ -1,16 +0,0 @@
-class Upsert
-  class Cell
-    # @private
-    class Mysql2_Client < Cell
-      attr_reader :name
-      attr_reader :value
-      attr_reader :quoted_value
-
-      def initialize(connection, name, value)
-        @name = name
-        @value = value
-        @quoted_value = connection.quote_value value
-      end
-    end
-  end
-end

data/lib/upsert/cell/PG_Connection.rb

@@ -1,28 +0,0 @@
-class Upsert
-  class Cell
-    # @private
-    class PG_Connection < Cell
-      attr_reader :name
-      attr_reader :value
-      attr_reader :quoted_name
-
-      def initialize(connection, name, value)
-        @name = name
-        @value = value
-        @quoted_name = connection.quote_ident name
-      end
-
-      def bind_value
-        return @bind_value if defined?(@bind_value)
-        @bind_value = case value
-        when Upsert::Binary
-          { :value => value.value, :format => 1 }
-        when Time, DateTime
-          [value.strftime(ISO8601_DATETIME), sprintf(USEC_SPRINTF, value.usec)].join('.')
-        else
-          value
-        end
-      end
-    end
-  end
-end

data/lib/upsert/cell/SQLite3_Database.rb

@@ -1,36 +0,0 @@
-class Upsert
-  class Cell
-    # @private
-    class SQLite3_Database < Cell
-      attr_reader :name
-      attr_reader :value
-      attr_reader :quoted_name
-
-      def initialize(connection, name, value)
-        @name = name
-        @value = value
-        @quoted_name = connection.quote_ident name
-      end
-
-      def bind_value
-        return @bind_value if defined?(@bind_value)
-        @bind_value = case value
-        when Upsert::Binary
-          SQLite3::Blob.new value.value
-        when BigDecimal
-          value.to_s('F')
-        when TrueClass
-          't'
-        when FalseClass
-          'f'
-        when Time, DateTime
-          [value.strftime(ISO8601_DATETIME), sprintf(USEC_SPRINTF, value.usec)].join('.')
-        when Date
-          value.strftime ISO8601_DATE
-        else
-          value
-        end
-      end
-    end
-  end
-end

data/lib/upsert/column_definition/Mysql2_Client.rb

@@ -1,24 +0,0 @@
-class Upsert
-  class ColumnDefinition
-    # @private
-    class Mysql2_Client < ColumnDefinition
-      class << self
-        def all(connection, table_name)
-          connection.execute("SHOW COLUMNS FROM #{connection.quote_ident(table_name)}").map do |row|
-            name, type, default = if row.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
-              # ["name", "varchar(255)", "YES", "UNI", nil, ""]
-              row.values_at(0,1,4)
-            else
-              # {"Field"=>"name", "Type"=>"varchar(255)", "Null"=>"NO", "Key"=>"PRI", "Default"=>nil, "Extra"=>""}
-              [row['Field'], row['Type'], row['Default']]
-            end
-            new connection, name, type, default
-          end.sort_by do |cd|
-            cd.name
-          end
-        end
-      end
-    end
-  end
-end

data/lib/upsert/column_definition/SQLite3_Database.rb

@@ -1,7 +0,0 @@
-class Upsert
-  class ColumnDefinition
-    # @private
-    class SQLite3_Database < ColumnDefinition
-    end
-  end
-end

data/lib/upsert/row/Mysql2_Client.rb

@@ -1,21 +0,0 @@
-class Upsert
-  class Row
-    # @private
-    class Mysql2_Client < Row
-      attr_reader :original_setter_keys
-
-      def initialize(controller, raw_selector, raw_setter)
-        super
-        @original_setter_keys = raw_setter.keys.map(&:to_s)
-      end
-
-      def quoted_setter_values
-        @quoted_setter_values ||= setter.values.map(&:quoted_value)
-      end
-
-      def values_sql_bytesize
-        @values_sql_bytesize ||= quoted_setter_values.inject(0) { |sum, quoted_value| sum + quoted_value.to_s.bytesize } + setter.length - 1
-      end
-    end
-  end
-end

data/lib/upsert/row/PG_Connection.rb

@@ -1,7 +0,0 @@
-class Upsert
-  class Row
-    # @private
-    class PG_Connection < Row
-    end
-  end
-end

data/lib/upsert/row/SQLite3_Database.rb

@@ -1,7 +0,0 @@
-class Upsert
-  class Row
-    # @private
-    class SQLite3_Database < Row
-    end
-  end
-end