ghazel-ar-extensions 0.9.3.1 → 0.9.3.2

data/lib/ar-extensions/adapters/mysql.rb

@@ -1,10 +1,57 @@
-ActiveRecord::ConnectionAdapters::MysqlAdapter.class_eval do
+module ActiveRecord::Extensions::ConnectionAdapters::MysqlAdapter # :nodoc:
+
+  include ActiveRecord::Extensions::Import::ImportSupport
+  include ActiveRecord::Extensions::Import::OnDuplicateKeyUpdateSupport
+
   # Returns the maximum number of bytes that the server will allow
   # in a single packet
   def max_allowed_packet # :nodoc:
     result = execute( "SHOW VARIABLES like 'max_allowed_packet';" )
-    result.fetch_row[1].to_i
+    # original Mysql gem responds to #fetch_row while Mysql2 responds to #first
+    val = result.respond_to?(:fetch_row) ? result.fetch_row[1] : result.first[1]
+    val.to_i
   end
 
   def rollup_sql; " WITH ROLLUP "; end
+
+  # Returns a generated ON DUPLICATE KEY UPDATE statement given the passed
+  # in +args+. 
+  def sql_for_on_duplicate_key_update( table_name, *args ) # :nodoc:
+    sql = ' ON DUPLICATE KEY UPDATE '
+    arg = args.first
+    if arg.is_a?( Array )
+      sql << sql_for_on_duplicate_key_update_as_array( table_name, arg )
+    elsif arg.is_a?( Hash )
+      sql << sql_for_on_duplicate_key_update_as_hash( table_name, arg )
+    elsif arg.is_a?( String )
+      sql << arg
+    else
+      raise ArgumentError.new( "Expected Array or Hash" )
+    end
+    sql
+  end
+
+  def sql_for_on_duplicate_key_update_as_array( table_name, arr )  # :nodoc:
+    results = arr.map do |column|
+      qc = quote_column_name( column )
+      "#{table_name}.#{qc}=VALUES(#{qc})"        
+    end
+    results.join( ',' )
+  end
+  
+  def sql_for_on_duplicate_key_update_as_hash( table_name, hsh ) # :nodoc:
+    sql = ' ON DUPLICATE KEY UPDATE '
+    results = hsh.map do |column1, column2|
+      qc1 = quote_column_name( column1 )
+      qc2 = quote_column_name( column2 )
+      "#{table_name}.#{qc1}=VALUES( #{qc2} )"
+    end
+    results.join( ',')
+  end
+
+  #return true if the statement is a duplicate key record error
+  def duplicate_key_update_error?(exception)# :nodoc:
+    exception.is_a?(ActiveRecord::StatementInvalid) && exception.to_s.include?('Duplicate entry')
+  end
+
 end

data/lib/ar-extensions/import/mysql.rb

@@ -1,50 +1,3 @@
-module ActiveRecord::Extensions::ConnectionAdapters::MysqlAdapter # :nodoc:
-
-  include ActiveRecord::Extensions::Import::ImportSupport  
-  include ActiveRecord::Extensions::Import::OnDuplicateKeyUpdateSupport
-    
-  # Returns a generated ON DUPLICATE KEY UPDATE statement given the passed
-  # in +args+. 
-  def sql_for_on_duplicate_key_update( table_name, *args ) # :nodoc:
-    sql = ' ON DUPLICATE KEY UPDATE '
-    arg = args.first
-    if arg.is_a?( Array )
-      sql << sql_for_on_duplicate_key_update_as_array( table_name, arg )
-    elsif arg.is_a?( Hash )
-      sql << sql_for_on_duplicate_key_update_as_hash( table_name, arg )
-    elsif arg.is_a?( String )
-      sql << arg
-    else
-      raise ArgumentError.new( "Expected Array or Hash" )
-    end
-    sql
-  end
-
-  def sql_for_on_duplicate_key_update_as_array( table_name, arr )  # :nodoc:
-    results = arr.map do |column|
-      qc = quote_column_name( column )
-      "#{table_name}.#{qc}=VALUES(#{qc})"        
-    end
-    results.join( ',' )
-  end
-  
-  def sql_for_on_duplicate_key_update_as_hash( table_name, hsh ) # :nodoc:
-    sql = ' ON DUPLICATE KEY UPDATE '
-    results = hsh.map do |column1, column2|
-      qc1 = quote_column_name( column1 )
-      qc2 = quote_column_name( column2 )
-      "#{table_name}.#{qc1}=VALUES( #{qc2} )"
-    end
-    results.join( ',')
-  end
-
-  #return true if the statement is a duplicate key record error
-  def duplicate_key_update_error?(exception)# :nodoc:
-    exception.is_a?(ActiveRecord::StatementInvalid) && exception.to_s.include?('Duplicate entry')
-  end
-
-end
-
 ActiveRecord::ConnectionAdapters::MysqlAdapter.class_eval do
   include ActiveRecord::Extensions::ConnectionAdapters::MysqlAdapter
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ghazel-ar-extensions
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 9
   - 3
-  - 1
-  version: 0.9.3.1
+  - 2
+  version: 0.9.3.2
 platform: ruby
 authors: 
 - Zach Dennis
@@ -59,7 +59,6 @@ files:
 - config/postgresql.schema
 - lib/ar-extensions/adapters/abstract_adapter.rb
 - lib/ar-extensions/adapters/mysql.rb
-- lib/ar-extensions/adapters/mysql2.rb
 - lib/ar-extensions/adapters/oracle.rb
 - lib/ar-extensions/adapters/postgresql.rb
 - lib/ar-extensions/adapters/sqlite.rb

data/lib/ar-extensions/adapters/mysql2.rb

@@ -1,10 +0,0 @@
-ActiveRecord::ConnectionAdapters::Mysql2Adapter.class_eval do
-  # Returns the maximum number of bytes that the server will allow
-  # in a single packet
-  def max_allowed_packet # :nodoc:
-    result = execute( "SHOW VARIABLES like 'max_allowed_packet';" )
-    result.first[1].to_i
-  end
-
-  def rollup_sql; " WITH ROLLUP "; end
-end