adapter_extensions 0.4.0 → 0.5.0

data/CHANGELOG

@@ -20,4 +20,7 @@
 
 0.4 - September 17, 2007
 * Added copy_table method that can copy the structure and data from one table to another. Currently implemented in MySQL (tested), PostgreSQL (tested) and SQL Server adapters (untested).
-* Added support for SELECT..INTO for PostgreSQL.
+* Added support for SELECT..INTO for PostgreSQL.
+
+0.5 - 
+* Updated dependencies for gem to current versions of ActiveRecord, ActiveSupport and Rake. May not be compatible with Rails versions less than 2.x.

data/README

@@ -1,3 +1,7 @@
 This library provides extensions to Rails' ActiveRecord adapters.
 
+As of version 0.5, adapter_extensions has dependencies on ActiveSupport and ActiveRecord 2.1.x or higher.
+
+To use the MySQL adapter extensions with Rails 2.x, you must patch the mysql_adapter with the mysql_adapter_opt_local_infile.patch.
+
 To execute the unit tests you must first construct a adapter_extensions_unittest database.

data/Rakefile

@@ -4,6 +4,7 @@ require 'rake/rdoctask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
+require 'date'
 
 require File.join(File.dirname(__FILE__), 'lib/adapter_extensions', 'version')
 
@@ -66,9 +67,9 @@ spec = Gem::Specification.new do |s|
     Provides various extensions to the Rails ActiveRecord adapters.
   EOF
 
-  s.add_dependency('rake', '>= 0.7.1')
-  s.add_dependency('activesupport',    '>= 1.3.1')
-  s.add_dependency('activerecord',     '>= 1.14.4')
+  s.add_dependency('rake', '>= 0.8.3')
+  s.add_dependency('activesupport',    '>= 2.1.0')
+  s.add_dependency('activerecord',     '>= 2.1.0')
   s.add_dependency('fastercsv',        '>= 1.0.0')
 
   s.rdoc_options << '--exclude' << '.'
@@ -89,6 +90,15 @@ Rake::GemPackageTask.new(spec) do |pkg|
   pkg.need_zip = true
 end
 
+namespace :github do
+  desc "Update Github Gemspec"
+  task :update_gemspec do
+    File.open(File.join(File.dirname(__FILE__), "#{spec.name}.gemspec"), "w"){|f| f << spec.to_ruby}
+  end
+end
+
+
+
 desc "Generate code statistics"
 task :lines do
   lines, codelines, total_lines, total_codelines = 0, 0, 0, 0
@@ -130,11 +140,19 @@ task :pdoc => [:rdoc] do
   Rake::SshDirPublisher.new("aeden@rubyforge.org", "/var/www/gforge-projects/activewarehouse/adapter_extensions/rdoc", "rdoc").upload
 end
 
+desc "Install the gem from a local generated package"
+task :install => [:package] do
+  windows = RUBY_PLATFORM =~ /mswin/
+  sudo = windows ? '' : 'sudo'
+  gem = windows ? 'gem.bat' : 'gem'
+  `#{sudo} #{gem} install pkg/#{PKG_NAME}-#{PKG_VERSION}`
+end
+
 desc "Reinstall the gem from a local package copy"
 task :reinstall => [:package] do
   windows = RUBY_PLATFORM =~ /mswin/
   sudo = windows ? '' : 'sudo'
   gem = windows ? 'gem.bat' : 'gem'
-  `#{sudo} #{gem} uninstall -x -i #{PKG_NAME}`
+  `#{sudo} #{gem} uninstall #{PKG_NAME} -x`
   `#{sudo} #{gem} install pkg/#{PKG_NAME}-#{PKG_VERSION}`
 end

data/lib/adapter_extensions.rb

@@ -5,19 +5,8 @@
 puts "Using AdapterExtensions"
 
 require 'rubygems'
-unless Kernel.respond_to?(:gem)
-  Kernel.send :alias_method, :gem, :require_gem
-end
-
-unless defined?(ActiveSupport)
-  gem 'activesupport'
-  require 'active_support'
-end
-
-unless defined?(ActiveRecord)
-  gem 'activerecord'
-  require 'active_record'
-end
+require 'active_support'
+require 'active_record'
 
 $:.unshift(File.dirname(__FILE__))
 Dir[File.dirname(__FILE__) + "/adapter_extensions/**/*.rb"].each { |file| require(file) }

data/lib/adapter_extensions/connection_adapters/mysql_adapter.rb

@@ -35,6 +35,18 @@ module ActiveRecord #:nodoc:
       # * <tt>:enclosed_by</tt> -- The field enclosure
       def do_bulk_load(file, table_name, options={})
         return if File.size(file) == 0
+
+        # an unfortunate hack - setting the bulk load option after the connection has been 
+        # established does not seem to have any effect, and since the connection is made when 
+        # active-record is loaded, there's no chance for us to sneak it in earlier. So we 
+        # disconnect, set the option, then reconnect - fortunately, this only needs to happen once.
+        unless @bulk_load_enabled
+          disconnect!
+          @connection.options(Mysql::OPT_LOCAL_INFILE, true)
+          connect
+          @bulk_load_enabled = true
+        end
+
         q = "LOAD DATA LOCAL INFILE '#{file}' INTO TABLE #{table_name}"
         if options[:fields]
           q << " FIELDS"
@@ -46,21 +58,6 @@ module ActiveRecord #:nodoc:
         execute(q)
       end
       
-      private
-      def connect
-        encoding = @config[:encoding]
-        if encoding
-          @connection.options(Mysql::SET_CHARSET_NAME, encoding) rescue nil
-        end
-        @connection.options(Mysql::OPT_LOCAL_INFILE, true)
-        @connection.ssl_set(@config[:sslkey], @config[:sslcert], @config[:sslca], @config[:sslcapath], @config[:sslcipher]) if @config[:sslkey]
-        @connection.real_connect(*@connection_options)
-        execute("SET NAMES '#{encoding}'") if encoding
-
-        # By default, MySQL 'where id is null' selects the last inserted id.
-        # Turn this off. http://dev.rubyonrails.org/ticket/6778
-        execute("SET SQL_AUTO_IS_NULL=0")
-      end
     end
   end
 end

data/lib/adapter_extensions/connection_adapters/postgresql_adapter.rb

@@ -28,6 +28,7 @@ module ActiveRecord #:nodoc:
       # * <tt>:columns</tt> -- Array of column names defining the source file column order
       # * <tt>:fields</tt> -- Hash of options for fields:
       # * <tt>:delimited_by</tt> -- The field delimiter
+      # * <tt>:null_string</tt> -- The string that should be interpreted as NULL (in addition to \N)
       # * <tt>:enclosed_by</tt> -- The field enclosure
       def do_bulk_load(file, table_name, options={})
         q = "COPY #{table_name} "
@@ -36,7 +37,8 @@ module ActiveRecord #:nodoc:
         if options[:fields]
           q << "WITH "
           q << "DELIMITER '#{options[:fields][:delimited_by]}' " if options[:fields][:delimited_by]
-          if options[:fields][:enclosed_by]
+          q << "NULL '#{options[:fields][:null_string]}'" if options[:fields][:null_string]
+          if options[:fields][:enclosed_by] || options[:ignore] && options[:ignore] > 0
             q << "CSV "
             q << "HEADER " if options[:ignore] && options[:ignore] > 0
             q << "QUOTE '#{options[:fields][:enclosed_by]}' " if options[:fields][:enclosed_by]

data/lib/adapter_extensions/version.rb

@@ -2,7 +2,7 @@
 module AdapterExtensions#:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 4
+    MINOR = 5
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

metadata

@@ -1,93 +1,104 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: adapter_extensions
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
-date: 2007-09-17 00:00:00 +02:00
-summary: Extensions to Rails ActiveRecord adapters.
-require_paths: 
-- lib
-email: anthonyeden@gmail.com
-homepage: http://activewarehouse.rubyforge.org/adapter_extensions
-rubyforge_project: activewarehouse
-description: Provides various extensions to the Rails ActiveRecord adapters.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.5.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Anthony Eden
-files: 
-- CHANGELOG
-- README
-- LICENSE
-- Rakefile
-- lib/adapter_extensions
-- lib/adapter_extensions/connection_adapters
-- lib/adapter_extensions/connection_adapters/abstract_adapter.rb
-- lib/adapter_extensions/connection_adapters/mysql_adapter.rb
-- lib/adapter_extensions/connection_adapters/postgresql_adapter.rb
-- lib/adapter_extensions/connection_adapters/sqlserver_adapter.rb
-- lib/adapter_extensions/version.rb
-- lib/adapter_extensions.rb
-test_files: []
-
-rdoc_options: 
-- --exclude
-- .
-extra_rdoc_files: []
-
-executables: []
-
-extensions: []
-
-requirements: []
+autorequire: 
+bindir: bin
+cert_chain: []
 
+date: 2009-01-14 00:00:00 -05:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
+  type: :runtime
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.7.1
+        version: 0.8.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
+  type: :runtime
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.1
+        version: 2.1.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
+  type: :runtime
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.14.4
+        version: 2.1.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: fastercsv
+  type: :runtime
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 1.0.0
     version: 
+description: Provides various extensions to the Rails ActiveRecord adapters.
+email: anthonyeden@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: []
+
+files: 
+- CHANGELOG
+- README
+- LICENSE
+- Rakefile
+- lib/adapter_extensions
+- lib/adapter_extensions/connection_adapters
+- lib/adapter_extensions/connection_adapters/abstract_adapter.rb
+- lib/adapter_extensions/connection_adapters/mysql_adapter.rb
+- lib/adapter_extensions/connection_adapters/postgresql_adapter.rb
+- lib/adapter_extensions/connection_adapters/sqlserver_adapter.rb
+- lib/adapter_extensions/version.rb
+- lib/adapter_extensions.rb
+has_rdoc: false
+homepage: http://activewarehouse.rubyforge.org/adapter_extensions
+post_install_message: 
+rdoc_options: 
+- --exclude
+- .
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: activewarehouse
+rubygems_version: 1.3.1
+signing_key: 
+specification_version: 2
+summary: Extensions to Rails ActiveRecord adapters.
+test_files: []
+