activerecord-import 0.3.1 → 0.4.0

data/test/support/postgresql/import_examples.rb

@@ -0,0 +1,21 @@
+# encoding: UTF-8
+def should_support_postgresql_import_functionality
+  describe "#supports_imports?" do
+    it "should support import" do
+      assert ActiveRecord::Base.supports_import?
+    end
+  end
+
+  describe "#import" do
+    it "should import with a single insert" do
+      # see ActiveRecord::ConnectionAdapters::AbstractAdapter test for more specifics
+      assert_difference "Topic.count", +10 do
+        result = Topic.import Build(3, :topics)
+        assert_equal 1, result.num_inserts
+
+        result = Topic.import Build(7, :topics)
+        assert_equal 1, result.num_inserts
+      end
+    end
+  end
+end

data/test/synchronize_test.rb

@@ -0,0 +1,22 @@
+require File.expand_path('../test_helper', __FILE__)
+
+describe ".synchronize" do
+  let(:topics){ Generate(3, :topics) }
+  let(:titles){ %w(one two three) }
+
+  setup do
+    # update records outside of ActiveRecord knowing about it
+    Topic.connection.execute( "UPDATE #{Topic.table_name} SET title='#{titles[0]}_haha' WHERE id=#{topics[0].id}", "Updating record 1 without ActiveRecord" )
+    Topic.connection.execute( "UPDATE #{Topic.table_name} SET title='#{titles[1]}_haha' WHERE id=#{topics[1].id}", "Updating record 2 without ActiveRecord" )
+    Topic.connection.execute( "UPDATE #{Topic.table_name} SET title='#{titles[2]}_haha' WHERE id=#{topics[2].id}", "Updating record 3 without ActiveRecord" )
+  end
+
+  it "reloads data for the specified records" do
+    Book.synchronize topics
+
+    actual_titles = topics.map(&:title)
+    assert_equal "#{titles[0]}_haha", actual_titles[0], "the first record was not correctly updated"
+    assert_equal "#{titles[1]}_haha", actual_titles[1], "the second record was not correctly updated"
+    assert_equal "#{titles[2]}_haha", actual_titles[2], "the third record was not correctly updated"
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,48 @@
+require 'pathname'
+test_dir = Pathname.new File.dirname(__FILE__)
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
+require "fileutils"
+
+ENV["RAILS_ENV"] = "test"
+
+require "bundler"
+Bundler.setup
+
+require "logger"
+require 'test/unit'
+require "active_record"
+require "active_record/fixtures"
+require "active_support/test_case"
+
+require "delorean"
+require "ruby-debug" if RUBY_VERSION.to_f < 1.9
+
+adapter = ENV["ARE_DB"] || "sqlite3"
+
+FileUtils.mkdir_p 'log'
+ActiveRecord::Base.logger = Logger.new("log/test.log")
+ActiveRecord::Base.logger.level = Logger::DEBUG
+ActiveRecord::Base.configurations["test"] = YAML.load_file(test_dir.join("database.yml"))[adapter]
+
+require "activerecord-import"
+ActiveRecord::Base.establish_connection "test"
+
+ActiveSupport::Notifications.subscribe(/active_record.sql/) do |event, _, _, _, hsh|
+  ActiveRecord::Base.logger.info hsh[:sql]
+end
+
+require "factory_girl"
+Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each{ |file| require file }
+
+# Load base/generic schema
+require test_dir.join("schema/version")
+require test_dir.join("schema/generic_schema")
+adapter_schema = test_dir.join("schema/#{adapter}_schema.rb")
+require adapter_schema if File.exists?(adapter_schema)
+
+Dir[File.dirname(__FILE__) + "/models/*.rb"].each{ |file| require file }
+
+# Prevent this deprecation warning from breaking the tests.
+Rake::FileList.send(:remove_method, :import)

data/test/value_sets_bytes_parser_test.rb

@@ -0,0 +1,96 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+
+require 'activerecord-import/value_sets_parser'
+
+describe ActiveRecord::Import::ValuesSetsBytesParser do
+  context "#parse - computing insert value sets" do
+    let(:parser){ ActiveRecord::Import::ValuesSetsBytesParser }
+    let(:base_sql){ "INSERT INTO atable (a,b,c)" }
+    let(:values){ [ "(1,2,3)", "(2,3,4)", "(3,4,5)" ] }
+
+    context "when the max allowed bytes is 33 and the base SQL is 26 bytes" do
+      it "should return 3 value sets when given 3 value sets of 7 bytes a piece" do
+        value_sets = parser.parse values, :reserved_bytes => base_sql.size, :max_bytes => 33
+        assert_equal 3, value_sets.size
+      end
+    end
+
+    context "when the max allowed bytes is 40 and the base SQL is 26 bytes" do
+      it "should return 3 value sets when given 3 value sets of 7 bytes a piece" do
+        value_sets = parser.parse values, :reserved_bytes => base_sql.size, :max_bytes => 40
+        assert_equal 3, value_sets.size
+      end
+    end
+
+    context "when the max allowed bytes is 41 and the base SQL is 26 bytes" do
+      it "should return 2 value sets when given 2 value sets of 7 bytes a piece" do
+        value_sets = parser.parse values, :reserved_bytes => base_sql.size, :max_bytes => 41
+        assert_equal 2, value_sets.size
+      end
+    end
+
+    context "when the max allowed bytes is 48 and the base SQL is 26 bytes" do
+      it "should return 2 value sets when given 2 value sets of 7 bytes a piece" do
+        value_sets = parser.parse values, :reserved_bytes => base_sql.size, :max_bytes => 48
+        assert_equal 2, value_sets.size
+      end
+    end
+
+    context "when the max allowed bytes is 49 and the base SQL is 26 bytes" do
+      it "should return 1 value sets when given 1 value sets of 7 bytes a piece" do
+        value_sets = parser.parse values, :reserved_bytes => base_sql.size, :max_bytes => 49
+        assert_equal 1, value_sets.size
+      end
+    end
+
+    context "when the max allowed bytes is 999999 and the base SQL is 26 bytes" do
+      it "should return 1 value sets when given 1 value sets of 7 bytes a piece" do
+        value_sets = parser.parse values, :reserved_bytes => base_sql.size, :max_bytes => 999999
+        assert_equal 1, value_sets.size
+      end
+    end
+
+    it "should properly build insert value set based on max packet allowed" do
+      values = [
+        "('1','2','3')",
+        "('4','5','6')",
+        "('7','8','9')" ]
+
+      values_size_in_bytes = values.sum {|value| value.bytesize }
+      base_sql_size_in_bytes = 15
+      max_bytes = 30
+
+      value_sets = parser.parse values, reserved_bytes: base_sql_size_in_bytes, max_bytes: max_bytes
+      assert_equal 3, value_sets.size, 'Three value sets were expected!'
+
+      # Each element in the value_sets array must be an array
+      value_sets.each_with_index { |e,i|
+        assert_kind_of Array, e, "Element #{i} was expected to be an Array!" }
+
+      # Each element in the values array should have a 1:1 correlation to the elements
+      # in the returned value_sets arrays
+      assert_equal values[0], value_sets[0].first
+      assert_equal values[1], value_sets[1].first
+      assert_equal values[2], value_sets[2].first
+    end
+
+    context "data contains multi-byte chars" do
+      it "should properly build insert value set based on max packet allowed" do
+        # each accented e should be 2 bytes, so each entry is 6 bytes instead of 5
+        values = [
+          "('é')",
+          "('é')" ]
+
+        base_sql_size_in_bytes = 15
+        max_bytes = 26
+
+        values_size_in_bytes = values.sum {|value| value.bytesize }
+        value_sets = parser.parse values, reserved_bytes: base_sql_size_in_bytes, max_bytes: max_bytes
+
+        assert_equal 2, value_sets.size, 'Two value sets were expected!'
+      end
+    end
+  end
+
+end
+

data/test/value_sets_records_parser_test.rb

@@ -0,0 +1,32 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+
+require 'activerecord-import/value_sets_parser'
+
+describe "ActiveRecord::Import::ValuesSetsRecordsParser" do
+  context "#parse - computing insert value sets" do
+    let(:parser){ ActiveRecord::Import::ValueSetsRecordsParser }
+    let(:base_sql){ "INSERT INTO atable (a,b,c)" }
+    let(:values){ [ "(1,2,3)", "(2,3,4)", "(3,4,5)" ] }
+
+    context "when the max number of records is 1" do
+      it "should return 3 value sets when given 3 values sets" do
+        value_sets = parser.parse values, :max_records => 1
+        assert_equal 3, value_sets.size
+      end
+    end
+
+    context "when the max number of records is 2" do
+      it "should return 2 value sets when given 3 values sets" do
+        value_sets = parser.parse values, :max_records => 2
+        assert_equal 2, value_sets.size
+      end
+    end
+
+    context "when the max number of records is 3" do
+      it "should return 1 value sets when given 3 values sets" do
+        value_sets = parser.parse values, :max_records => 3
+        assert_equal 1, value_sets.size
+      end
+    end
+  end
+end

metadata

@@ -1,93 +1,76 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.3.1
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-16 00:00:00.000000000 Z
+date: 2013-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   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: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
 description: Extraction of the ActiveRecord::Base#import functionality from ar-extensions
   for Rails 3 and beyond
-email: zach.dennis@gmail.com
+email:
+- zach.dennis@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.markdown
+extra_rdoc_files: []
 files:
+- .gitignore
+- Brewfile
+- Gemfile
 - README.markdown
 - Rakefile
-- VERSION
+- activerecord-import.gemspec
+- benchmarks/README
+- benchmarks/benchmark.rb
+- benchmarks/boot.rb
+- benchmarks/lib/base.rb
+- benchmarks/lib/cli_parser.rb
+- benchmarks/lib/float.rb
+- benchmarks/lib/mysql_benchmark.rb
+- benchmarks/lib/output_to_csv.rb
+- benchmarks/lib/output_to_html.rb
+- benchmarks/models/test_innodb.rb
+- benchmarks/models/test_memory.rb
+- benchmarks/models/test_myisam.rb
+- benchmarks/schema/mysql_schema.rb
+- gemfiles/3.1.gemfile
+- gemfiles/3.2.gemfile
+- gemfiles/4.0.gemfile
 - lib/activerecord-import.rb
 - lib/activerecord-import/active_record/adapters/abstract_adapter.rb
+- lib/activerecord-import/active_record/adapters/em_mysql2_adapter.rb
 - lib/activerecord-import/active_record/adapters/jdbcmysql_adapter.rb
 - lib/activerecord-import/active_record/adapters/mysql2_adapter.rb
 - lib/activerecord-import/active_record/adapters/mysql_adapter.rb
@@ -95,42 +78,121 @@ files:
 - lib/activerecord-import/active_record/adapters/seamless_database_pool_adapter.rb
 - lib/activerecord-import/active_record/adapters/sqlite3_adapter.rb
 - lib/activerecord-import/adapters/abstract_adapter.rb
+- lib/activerecord-import/adapters/em_mysql2_adapter.rb
 - lib/activerecord-import/adapters/mysql2_adapter.rb
 - lib/activerecord-import/adapters/mysql_adapter.rb
 - lib/activerecord-import/adapters/postgresql_adapter.rb
 - lib/activerecord-import/adapters/sqlite3_adapter.rb
 - lib/activerecord-import/base.rb
+- lib/activerecord-import/em_mysql2.rb
 - lib/activerecord-import/import.rb
 - lib/activerecord-import/mysql.rb
 - lib/activerecord-import/mysql2.rb
 - lib/activerecord-import/postgresql.rb
 - lib/activerecord-import/sqlite3.rb
 - lib/activerecord-import/synchronize.rb
+- lib/activerecord-import/value_sets_parser.rb
+- lib/activerecord-import/version.rb
+- test/adapters/em_mysql2.rb
+- test/adapters/jdbcmysql.rb
+- test/adapters/mysql.rb
+- test/adapters/mysql2.rb
+- test/adapters/mysql2spatial.rb
+- test/adapters/mysqlspatial.rb
+- test/adapters/postgis.rb
+- test/adapters/postgresql.rb
+- test/adapters/seamless_database_pool.rb
+- test/adapters/spatialite.rb
+- test/adapters/sqlite3.rb
+- test/database.yml.sample
+- test/em_mysql2/import_test.rb
+- test/import_test.rb
+- test/jdbcmysql/import_test.rb
+- test/models/book.rb
+- test/models/group.rb
+- test/models/topic.rb
+- test/models/widget.rb
+- test/mysql/import_test.rb
+- test/mysql2/import_test.rb
+- test/mysqlspatial/import_test.rb
+- test/mysqlspatial2/import_test.rb
+- test/postgis/import_test.rb
+- test/postgresql/import_test.rb
+- test/schema/generic_schema.rb
+- test/schema/mysql_schema.rb
+- test/schema/version.rb
+- test/sqlite3/import_test.rb
+- test/support/active_support/test_case_extensions.rb
+- test/support/factories.rb
+- test/support/generate.rb
+- test/support/mysql/assertions.rb
+- test/support/mysql/import_examples.rb
+- test/support/postgresql/import_examples.rb
+- test/synchronize_test.rb
+- test/test_helper.rb
+- test/value_sets_bytes_parser_test.rb
+- test/value_sets_records_parser_test.rb
 homepage: http://github.com/zdennis/activerecord-import
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -1608822567820744483
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Bulk-loading extension for ActiveRecord
-test_files: []
+test_files:
+- test/adapters/em_mysql2.rb
+- test/adapters/jdbcmysql.rb
+- test/adapters/mysql.rb
+- test/adapters/mysql2.rb
+- test/adapters/mysql2spatial.rb
+- test/adapters/mysqlspatial.rb
+- test/adapters/postgis.rb
+- test/adapters/postgresql.rb
+- test/adapters/seamless_database_pool.rb
+- test/adapters/spatialite.rb
+- test/adapters/sqlite3.rb
+- test/database.yml.sample
+- test/em_mysql2/import_test.rb
+- test/import_test.rb
+- test/jdbcmysql/import_test.rb
+- test/models/book.rb
+- test/models/group.rb
+- test/models/topic.rb
+- test/models/widget.rb
+- test/mysql/import_test.rb
+- test/mysql2/import_test.rb
+- test/mysqlspatial/import_test.rb
+- test/mysqlspatial2/import_test.rb
+- test/postgis/import_test.rb
+- test/postgresql/import_test.rb
+- test/schema/generic_schema.rb
+- test/schema/mysql_schema.rb
+- test/schema/version.rb
+- test/sqlite3/import_test.rb
+- test/support/active_support/test_case_extensions.rb
+- test/support/factories.rb
+- test/support/generate.rb
+- test/support/mysql/assertions.rb
+- test/support/mysql/import_examples.rb
+- test/support/postgresql/import_examples.rb
+- test/synchronize_test.rb
+- test/test_helper.rb
+- test/value_sets_bytes_parser_test.rb
+- test/value_sets_records_parser_test.rb
+has_rdoc: