adapter_extensions 0.1.2 → 0.2.0

data/CHANGELOG

@@ -1,2 +1,11 @@
 0.1.0 - March 5, 2007
-* Initial release
+* Initial release
+
+0.1.1 - March 5, 2007
+* Bug fixes
+
+0.1.2 - March 5, 2007
+* Bug fixes
+
+0.2.0 - March 6, 2007
+* SQL Server adapter included

data/Rakefile

@@ -121,6 +121,9 @@ end
 
 desc "Reinstall the gem from a local package copy"
 task :reinstall => [:package] do
-  `sudo gem uninstall -x -i #{PKG_NAME}`
-  `sudo gem install pkg/#{PKG_NAME}-#{PKG_VERSION}`
+  windows = RUBY_PLATFORM =~ /mswin/
+  sudo = windows ? '' : 'sudo'
+  gem = windows ? 'gem.bat' : 'gem'
+  `#{sudo} #{gem} uninstall -x -i #{PKG_NAME}`
+  `#{sudo} #{gem} install pkg/#{PKG_NAME}-#{PKG_VERSION}`
 end

data/lib/adapter_extensions/connection_adapters/abstract_adapter.rb

@@ -1,19 +1,28 @@
 # This source file contains extensions to the abstract adapter.
 module ActiveRecord #:nodoc:
   module ConnectionAdapters #:nodoc:
-    # Extensions to the AbstractAdapter. In some cases a default implementation is provided, 
-    # in others it is adapter-dependent and the method will raise a NotImplementedError if
-    # the adapter does not implement that method
+    # Extensions to the AbstractAdapter. In some cases a default implementation
+    # is provided, in others it is adapter-dependent and the method will
+    # raise a NotImplementedError if the adapter does not implement that method
     class AbstractAdapter
       # Truncate the specified table
       def truncate(table_name)
-        execute("TRUNCATE #{table_name}")
+        execute("TRUNCATE TABLE #{table_name}")
       end
       
-      # Bulk loading interface. Load the data from the specified file into the given
-      # table. Note that options will be adapter-dependent.
+      # Bulk loading interface. Load the data from the specified file into the
+      # given table. Note that options will be adapter-dependent.
       def bulk_load(file, table_name, options={})
-        raise NotImplementedError, "bulk_load is an abstract method"
+        raise ArgumentError, "#{file} does not exist" unless File.exist?(file)
+        raise ArgumentError, "#{table_name} does not exist" unless tables.include?(table_name)
+        do_bulk_load(file, table_name, options)
+      end
+      
+      protected
+      
+      # for subclasses to implement
+      def do_bulk_load(file, table_name, options={})
+        raise NotImplementedError, "do_bulk_load is an abstract method"
       end
     end
   end

data/lib/adapter_extensions/connection_adapters/mysql_adapter.rb

@@ -3,16 +3,20 @@ module ActiveRecord #:nodoc:
   module ConnectionAdapters #:nodoc:
     # Adds new functionality to ActiveRecord MysqlAdapter.
     class MysqlAdapter < AbstractAdapter
-      # Bulk load the data in the specified file. This implementation always uses the LOCAL keyword
+    
+      protected
+      # Call +bulk_load+, as that method wraps this method.
+      # 
+      #Bulk load the data in the specified file. This implementation always uses the LOCAL keyword
       # so the file must be found locally, not on the remote server, to be loaded.
       #
       # Options:
       # * <tt>:ignore</tt> -- Ignore the specified number of lines from the source file
       # * <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>:enclosed_by</tt> -- The field enclosure
-      def bulk_load(file, table_name, options={})
+      # * <tt>:delimited_by</tt> -- The field delimiter
+      # * <tt>:enclosed_by</tt> -- The field enclosure
+      def do_bulk_load(file, table_name, options={})
         q = "LOAD DATA LOCAL INFILE '#{file}' INTO TABLE #{table_name}"
         if options[:fields]
           q << " FIELDS"

data/lib/adapter_extensions/connection_adapters/sqlserver_adapter.rb

@@ -0,0 +1,30 @@
+# Source code for the SQLServerAdapter extensions.
+module ActiveRecord #:nodoc:
+  module ConnectionAdapters #:nodoc:
+    # Adds new functionality to ActiveRecord SQLServerAdapter.
+    class SQLServerAdapter < AbstractAdapter
+      protected
+      # Call +bulk_load+, as that method wraps this method.
+      # 
+      # Bulk load the data in the specified file. This implementation relies
+      # on bcp being in your PATH.
+      #
+      # Options:
+      # * <tt>:ignore</tt> -- Ignore the specified number of lines from the source file
+      # * <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>:enclosed_by</tt> -- The field enclosure
+      def do_bulk_load(file, table_name, options={})
+        env_name = attrs[:env] || RAILS_ENV
+        config = ActiveRecord::Base.configurations[env_name]
+          puts "Loading table \"#{table_name}\" from file \"#{filename}\""
+          cmd = "bcp \"#{config['database']}.dbo.#{table_name}\" in " +
+                "\"#{filename}\" -S \"#{config['host']}\" -c " +
+                "-t \"#{options[:delimited_by]}\" -b10000 -a8192 -q -E -U \"#{config['username']}\" " +
+                "-P \"#{config['password']}\" -e \"#{filename}.in.errors\""
+          `#{cmd}`
+      end
+    end
+  end
+end

data/lib/adapter_extensions/version.rb

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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0.10
 specification_version: 1
 name: adapter_extensions
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
-date: 2007-03-05 00:00:00 -05:00
+  version: 0.2.0
+date: 2007-03-06 00:00:00 -05:00
 summary: Extensions to Rails ActiveRecord adapters.
 require_paths: 
 - lib
@@ -39,6 +39,7 @@ files:
 - lib/adapter_extensions/version.rb
 - lib/adapter_extensions/connection_adapters/abstract_adapter.rb
 - lib/adapter_extensions/connection_adapters/mysql_adapter.rb
+- lib/adapter_extensions/connection_adapters/sqlserver_adapter.rb
 test_files: []
 
 rdoc_options: