upsert 0.5.0 → 1.0.2

data/lib/upsert/row.rb

@@ -1,7 +1,3 @@
-require 'upsert/row/mysql2_client'
-require 'upsert/row/pg_connection'
-require 'upsert/row/sqlite3_database'
-
 class Upsert
   # @private
   class Row
@@ -20,9 +16,9 @@ class Upsert
     attr_reader :setter
 
 
-    def initialize(parent, raw_selector, raw_setter)
-      connection = parent.connection
-      cell_class = parent.cell_class
+    def initialize(controller, raw_selector, raw_setter)
+      connection = controller.connection
+      cell_class = controller.cell_class
 
       @selector = raw_selector.inject({}) do |memo, (k, v)|
         memo[k.to_s] = cell_class.new(connection, k, v)

data/lib/upsert/row/{mysql2_client.rb → Mysql2_Client.rb}

@@ -4,7 +4,7 @@ class Upsert
     class Mysql2_Client < Row
       attr_reader :original_setter_keys
 
-      def initialize(parent, raw_selector, raw_setter)
+      def initialize(controller, raw_selector, raw_setter)
         super
         @original_setter_keys = raw_setter.keys.map(&:to_s)
       end

data/lib/upsert/version.rb

@@ -1,3 +1,3 @@
 class Upsert
-  VERSION = "0.5.0"
+  VERSION = "1.0.2"
 end

data/spec/correctness_spec.rb

@@ -32,6 +32,20 @@ describe Upsert do
       u.row(selector, setter)
       Pet.find_by_name('Jerry').tag_number.should == 20
     end
+
+    it "really limits its effects to the selector" do
+      p = Pet.new
+      p.name = 'Jerry'
+      p.gender = 'blue'
+      p.tag_number = 777
+      p.save!
+      Pet.find_by_name_and_gender('Jerry', 'blue').tag_number.should == 777
+      u = Upsert.new($conn, :pets)
+      selector = {name: 'Jerry', gender: 'red'} # this shouldn't select anything
+      setter = {tag_number: 888}
+      u.row(selector, setter)
+      Pet.find_by_name_and_gender('Jerry', 'blue').tag_number.should == 777
+    end
   end
   describe "is just as correct as other ways" do
     describe 'compared to native ActiveRecord' do
@@ -101,6 +115,6 @@ describe Upsert do
         end
       end
     end
-    
+
   end
 end

data/spec/database_functions_spec.rb

@@ -1,36 +1,42 @@
 require 'spec_helper'
 require 'stringio'
 describe Upsert do
-  if ENV['ADAPTER'] == 'postgresql'
-    describe 'PostgreSQL database functions' do
-      it "re-uses merge functions across connections" do
-        begin
-          io = StringIO.new
-          old_logger = Upsert.logger
-          Upsert.logger = Logger.new io, Logger::INFO
+  def fresh_connection
+    case ENV['ADAPTER']
+    when 'postgresql'
+      PGconn.new $conn_config
+    when 'mysql2'
+      Mysql2::Client.new $conn_config
+    end
+  end
+  describe 'database functions' do
+    it "re-uses merge functions across connections" do
+      begin
+        io = StringIO.new
+        old_logger = Upsert.logger
+        Upsert.logger = Logger.new io, Logger::INFO
 
-          # clear
-          Upsert.clear_database_functions(PGconn.new(:dbname => 'upsert_test'))
-          
-          # create
-          Upsert.new(PGconn.new(:dbname => 'upsert_test'), :pets).row :name => 'hello'
+        # clear
+        Upsert.clear_database_functions(fresh_connection)
+        
+        # create
+        Upsert.new(fresh_connection, :pets).row :name => 'hello'
 
-          # clear
-          Upsert.clear_database_functions(PGconn.new(:dbname => 'upsert_test'))
+        # clear
+        Upsert.clear_database_functions(fresh_connection)
 
-          # create (#2)
-          Upsert.new(PGconn.new(:dbname => 'upsert_test'), :pets).row :name => 'hello'
+        # create (#2)
+        Upsert.new(fresh_connection, :pets).row :name => 'hello'
 
-          # no create!
-          Upsert.new(PGconn.new(:dbname => 'upsert_test'), :pets).row :name => 'hello'
-          
-          io.rewind
-          hits = io.read.split("\n").grep(/Creating or replacing/)
-          hits.length.should == 2
-        ensure
-          Upsert.logger = old_logger
-        end
+        # no create!
+        Upsert.new(fresh_connection, :pets).row :name => 'hello'
+        
+        io.rewind
+        hits = io.read.split("\n").grep(/Creating or replacing/)
+        hits.length.should == 2
+      ensure
+        Upsert.logger = old_logger
       end
     end
   end
-end
+end if %w{ postgresql mysql2 }.include?(ENV['ADAPTER'])

data/spec/logger_spec.rb

@@ -1,18 +1,18 @@
 require 'spec_helper'
 describe Upsert do
   describe "logger" do
-    it "logs to stderr by default" do
+    it "logs where you tell it" do
       begin
-        old_stderr = $stderr
         old_logger = Upsert.logger
-        Upsert.logger = nil
-        $stderr = StringIO.new
-        Upsert.logger.warn "hello"
-        $stderr.rewind
-        $stderr.read.chomp.should == 'hello'
+        io = StringIO.new
+        Thread.exclusive do
+          Upsert.logger = Logger.new(io)
+          Upsert.logger.warn "hello"
+          io.rewind
+          io.read.chomp.should == 'hello'
+        end
       ensure
         Upsert.logger = old_logger
-        $stderr = old_stderr
       end
     end
 

data/spec/spec_helper.rb

@@ -14,23 +14,29 @@ when 'postgresql'
   system %{ dropdb upsert_test }
   system %{ createdb upsert_test }
   ActiveRecord::Base.establish_connection :adapter => 'postgresql', :database => 'upsert_test'
-  $conn = PGconn.new(:dbname => 'upsert_test')
+  $conn_config = { :dbname => 'upsert_test' }
+  $conn = PGconn.new $conn_config
 when 'mysql2'
   system %{ mysql -u root -ppassword -e "DROP DATABASE IF EXISTS upsert_test" }
   system %{ mysql -u root -ppassword -e "CREATE DATABASE upsert_test CHARSET utf8" }
   ActiveRecord::Base.establish_connection "#{RUBY_PLATFORM == 'java' ? 'mysql' : 'mysql2'}://root:password@127.0.0.1/upsert_test"
-  $conn = Mysql2::Client.new(:username => 'root', :password => 'password', :database => 'upsert_test')
+  $conn_config = { :username => 'root', :password => 'password', :database => 'upsert_test'}
+  $conn = Mysql2::Client.new $conn_config
 when 'sqlite3'
   ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => ':memory:'
   $conn = ActiveRecord::Base.connection.raw_connection
+  $conn_config = :use_active_record_raw_connection_yo
 else
   raise "not supported"
 end
 
-if ENV['UPSERT_DEBUG'] == 'true'
-  require 'logger'
-  ActiveRecord::Base.logger = Logger.new($stdout)
+require 'logger'
+ActiveRecord::Base.logger = Logger.new('test.log')
+
+if ENV['VERBOSE'] == 'true'
   ActiveRecord::Base.logger.level = Logger::DEBUG
+else
+  ActiveRecord::Base.logger.level = Logger::WARN
 end
 
 class Pet < ActiveRecord::Base

data/spec/type_safety_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+describe Upsert do
+  describe "type safety" do
+    it "does not attempt to typecast values" do
+      upsert = Upsert.new $conn, :pets
+      lambda do
+        upsert.row :tag_number => ''
+      end.should raise_error(PG::Error, /invalid input syntax/)
+    end
+  end
+end if ENV['ADAPTER'] == 'postgresql'

data/upsert.gemspec

@@ -4,8 +4,9 @@ require File.expand_path('../lib/upsert/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Seamus Abshere"]
   gem.email         = ["seamus@abshere.net"]
-  gem.description   = %q{Upsert for MySQL, PostgreSQL, and SQLite3. Codifies various SQL MERGE tricks like MySQL's ON DUPLICATE KEY UPDATE, PostgreSQL's CREATE FUNCTION merge_db, and SQLite's INSERT OR IGNORE.}
-  gem.summary       = %q{Upsert for MySQL, PostgreSQL, and SQLite3. Finally, all those SQL MERGE tricks codified.}
+  t = %{Make it easy to upsert on MySQL, PostgreSQL, and SQLite3. Transparently creates merge functions for MySQL and PostgreSQL; on SQLite3, uses INSERT OR IGNORE.}
+  gem.description   = t
+  gem.summary       = t
   gem.homepage      = "https://github.com/seamusabshere/upsert"
 
   gem.files         = `git ls-files`.split($\)
@@ -27,6 +28,7 @@ Gem::Specification.new do |gem|
   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'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upsert
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-21 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: posix-spawn
@@ -187,6 +187,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  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: activerecord-import
   requirement: !ruby/object:Gem::Requirement
@@ -219,9 +235,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Upsert for MySQL, PostgreSQL, and SQLite3. Codifies various SQL MERGE
-  tricks like MySQL's ON DUPLICATE KEY UPDATE, PostgreSQL's CREATE FUNCTION merge_db,
-  and SQLite's INSERT OR IGNORE.
+description: Make it easy to upsert on MySQL, PostgreSQL, and SQLite3. Transparently
+  creates merge functions for MySQL and PostgreSQL; on SQLite3, uses INSERT OR IGNORE.
 email:
 - seamus@abshere.net
 executables: []
@@ -238,24 +253,26 @@ files:
 - lib/upsert.rb
 - lib/upsert/active_record_upsert.rb
 - lib/upsert/binary.rb
-- lib/upsert/buffer.rb
-- lib/upsert/buffer/mysql2_client.rb
-- lib/upsert/buffer/pg_connection.rb
-- lib/upsert/buffer/pg_connection/column_definition.rb
-- lib/upsert/buffer/pg_connection/merge_function.rb
-- lib/upsert/buffer/sqlite3_database.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/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/connection.rb
-- lib/upsert/connection/mysql2_client.rb
-- lib/upsert/connection/pg_connection.rb
-- lib/upsert/connection/sqlite3_database.rb
+- lib/upsert/connection/Mysql2_Client.rb
+- lib/upsert/connection/PG_Connection.rb
+- lib/upsert/connection/SQLite3_Database.rb
+- lib/upsert/merge_function.rb
+- lib/upsert/merge_function/Mysql2_Client.rb
+- lib/upsert/merge_function/PG_Connection.rb
+- lib/upsert/merge_function/SQLite3_Database.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/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
@@ -273,6 +290,7 @@ files:
 - spec/speed_spec.rb
 - spec/threaded_spec.rb
 - spec/timezones_spec.rb
+- spec/type_safety_spec.rb
 - upsert.gemspec
 homepage: https://github.com/seamusabshere/upsert
 licenses: []
@@ -297,8 +315,8 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Upsert for MySQL, PostgreSQL, and SQLite3. Finally, all those SQL MERGE tricks
-  codified.
+summary: Make it easy to upsert on MySQL, PostgreSQL, and SQLite3. Transparently creates
+  merge functions for MySQL and PostgreSQL; on SQLite3, uses INSERT OR IGNORE.
 test_files:
 - spec/active_record_upsert_spec.rb
 - spec/binary_spec.rb
@@ -316,4 +334,5 @@ test_files:
 - spec/speed_spec.rb
 - spec/threaded_spec.rb
 - spec/timezones_spec.rb
+- spec/type_safety_spec.rb
 has_rdoc: 

data/lib/upsert/buffer.rb

@@ -1,36 +0,0 @@
-require 'upsert/buffer/mysql2_client'
-require 'upsert/buffer/pg_connection'
-require 'upsert/buffer/sqlite3_database'
-
-class Upsert
-  # @private
-  class Buffer
-    attr_reader :parent
-    attr_reader :rows
-
-    def initialize(parent)
-      @parent = parent
-      @rows = []
-    end
-
-    def <<(row)
-      rows << row
-      ready
-    end
-
-    def async?
-      !!@async
-    end
-
-    def async!
-      @async = true
-    end
-
-    def sync!
-      @async = false
-      until rows.empty?
-        ready
-      end
-    end
-  end
-end

data/lib/upsert/buffer/mysql2_client.rb

@@ -1,80 +0,0 @@
-class Upsert
-  # @private
-  class Buffer
-    class Mysql2_Client < Buffer
-      def ready
-        return if rows.empty?
-        connection = parent.connection
-        if not async?
-          connection.execute sql
-          rows.clear
-          return
-        end
-        @cumulative_sql_bytesize ||= static_sql_bytesize
-        new_row = rows.pop
-        d = new_row.values_sql_bytesize + 3 # ),(
-        if @cumulative_sql_bytesize + d > max_sql_bytesize
-          connection.execute sql
-          rows.clear
-          @cumulative_sql_bytesize = static_sql_bytesize + d
-        else
-          @cumulative_sql_bytesize += d
-        end
-        rows << new_row
-        nil
-      end
-
-      def setter
-        @setter ||= rows.first.setter.keys
-      end
-
-      def original_setter
-        @original_setter ||= rows.first.original_setter_keys
-      end
-
-      def insert_part
-        @insert_part ||= begin
-          connection = parent.connection
-          column_names = setter.map { |k| connection.quote_ident(k) }
-          %{INSERT INTO #{parent.quoted_table_name} (#{column_names.join(',')}) VALUES }
-        end
-      end
-
-      def update_part
-        @update_part ||= begin
-          connection = parent.connection
-          updaters = setter.map do |k|
-            quoted_name = connection.quote_ident(k)
-            if original_setter.include?(k)
-              "#{quoted_name}=VALUES(#{quoted_name})"
-            else
-              # NOOP
-              "#{quoted_name}=#{quoted_name}"
-            end
-          end.join(',')
-          %{ ON DUPLICATE KEY UPDATE #{updaters}}
-        end
-      end
-
-      # where 2 is the parens
-      def static_sql_bytesize
-        @static_sql_bytesize ||= insert_part.bytesize + update_part.bytesize + 2
-      end
-
-      def sql
-        [
-          insert_part,
-          '(',
-          rows.map { |row| row.quoted_setter_values.join(',') }.join('),('),
-          ')',
-          update_part
-        ].join
-      end
-
-      # since setting an option like :as => :hash actually persists that option to the client, don't pass any options
-      def max_sql_bytesize
-        @max_sql_bytesize ||= parent.connection.database_variable_get(:MAX_ALLOWED_PACKET).to_i
-      end
-    end
-  end
-end