activerecord-database_unsigned_columns 0.0.8 → 0.0.9

data/lib/active_record/database_unsigned_columns/adapters/jdbc_mysql_adapter.rb

@@ -0,0 +1,33 @@
+# endocing: utf-8
+module ActiveRecord
+  module DatabaseUnsignedColumns
+    module Adapters
+      
+      module JdbcMysqlAdapter
+        
+        extend ActiveSupport::Concern
+        
+        included do
+          puts "Module 'ActiveRecord:DatabaseUnsignedColumns::Adapters::JdbcMysqlAdapter included to '#{self.name}'"
+          alias_method_chain :modify_types, :unsigned
+          alias_method_chain :type_to_sql,  :unsigned
+          # alias_method_chain :create_table,         :mysql_options
+        end
+        
+        def modify_types_with_unsigned(types)
+          types = modify_types_without_unsigned(types)
+          types[:primary_key] = "INT UNSIGNED DEFAULT NULL auto_increment PRIMARY KEY" if types.has_key? :primary_key
+          types
+        end
+          
+        def type_to_sql_with_unsigned(type, limit = nil, precision = nil, scale = nil, unsigned = false)
+          sql = type_to_sql_without_unsigned(type, limit, precision, scale)
+          sql << ' UNSIGNED' if unsigned && (['integer', 'decimal', 'float', 'boolean'].include? type.to_s)
+          sql
+        end
+        
+      end
+      
+    end
+  end
+end

data/lib/active_record/database_unsigned_columns/adapters/mysql_adapter.rb

@@ -15,9 +15,6 @@ module ActiveRecord
           alias_method_chain :add_column_sql, :unsigned
           alias_method_chain :type_to_sql,    :unsigned
           # alias_method_chain :create_table,         :mysql_options
-          
-          # Incluir patch a self::Column:
-          #"#{self.name}::Column".constantize.send :include, NumericTypeColumn::ActiveRecord::MysqlColumnPatch
         end
     
 =begin
@@ -26,21 +23,21 @@ module ActiveRecord
           end
 =end
           
-          protected
-        
-        def add_column_sql_with_unsigned(table_name, column_name, type, options = {})
-          is_unsigned_valid = (((options.has_key? :unsigned) && (options[:unsigned] == true)) && (['integer', 'decimal', 'float', 'boolean'].include? type.to_s))
-          add_column_sql = "ADD #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale], is_unsigned_valid)}"
-          add_column_options!(add_column_sql, options)
-          add_column_position!(add_column_sql, options)
-          add_column_sql
-        end
+        protected
         
-        def type_to_sql_with_unsigned(type, limit = nil, precision = nil, scale = nil, unsigned = false)
-          sql = type_to_sql_without_unsigned(type, limit, precision, scale)
-          sql << ' UNSIGNED' if unsigned && (['integer', 'decimal', 'float', 'boolean'].include? type.to_s)
-          sql
-        end
+          def add_column_sql_with_unsigned(table_name, column_name, type, options = {})
+            is_unsigned_valid = (((options.has_key? :unsigned) && (options[:unsigned] == true)) && (['integer', 'decimal', 'float', 'boolean'].include? type.to_s))
+            add_column_sql = "ADD #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale], is_unsigned_valid)}"
+            add_column_options!(add_column_sql, options)
+            add_column_position!(add_column_sql, options)
+            add_column_sql
+          end
+          
+          def type_to_sql_with_unsigned(type, limit = nil, precision = nil, scale = nil, unsigned = false)
+            sql = type_to_sql_without_unsigned(type, limit, precision, scale)
+            sql << ' UNSIGNED' if unsigned && (['integer', 'decimal', 'float', 'boolean'].include? type.to_s)
+            sql
+          end
         
       end
       

data/lib/active_record/database_unsigned_columns/railtie.rb

@@ -17,15 +17,28 @@ module ActiveRecord
           ActiveRecord::ConnectionAdapters::TableDefinition.send  :include, ActiveRecord::DatabaseUnsignedColumns::Definitions::Table
           
           # Agregar modulo a los adapters de BD:
-          require 'active_record/database_unsigned_columns/adapters/mysql_adapter'
           [
-            "ActiveRecord::ConnectionAdapters::MysqlAdapter",
-            "ActiveRecord::ConnectionAdapters::Mysql2Adapter",
-            "ActiveRecord::ConnectionAdapters::Mysql2SpatialAdapter", # Adapter para rgeo-mysql
-            "ArJdbc::MySQL"                                           # Adapter para jRuby JDBC
+            "ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter",
+            #"ActiveRecord::ConnectionAdapters::Mysql2Adapter",
+            #"ActiveRecord::ConnectionAdapters::Mysql2SpatialAdapter", # Adapter para rgeo-mysql
+            #"ArJdbc::MySQL"                                           # Adapter para jRuby JDBC
           ].each do |mysql_adapter_class|
             adapter_class = mysql_adapter_class.safe_constantize
-            adapter_class.send :include, ActiveRecord::DatabaseUnsignedColumns::Adapters::MysqlAdapter if adapter_class.present?
+            if adapter_class.present?
+              require 'active_record/database_unsigned_columns/adapters/mysql_adapter'
+              adapter_class.send :include, ActiveRecord::DatabaseUnsignedColumns::Adapters::MysqlAdapter 
+            end
+          end
+          
+          # Agregar modulo a los adapters de JDBC:
+          [
+            "ArJdbc::MySQL"
+          ].each do |mysql_adapter_class|
+            adapter_class = mysql_adapter_class.safe_constantize
+            if adapter_class.present?
+              require 'active_record/database_unsigned_columns/adapters/jdbc_mysql_adapter'
+              adapter_class.send :include, ActiveRecord::DatabaseUnsignedColumns::Adapters::JdbcMysqlAdapter
+            end 
           end
           
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-database_unsigned_columns
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +67,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/active_record/database_unsigned_columns/adapters/jdbc_mysql_adapter.rb
 - lib/active_record/database_unsigned_columns/adapters/mysql_adapter.rb
 - lib/active_record/database_unsigned_columns/definitions/column.rb
 - lib/active_record/database_unsigned_columns/definitions/table.rb