Ticket #4353: bigint_support_in_migrations.3.diff

test/migration_test.rb

@@ -72 +72 @@
-      Person.connection.drop_table :testings rescue nil
-    end
-
+    def test_create_table_with_big_id
+      Person.connection.create_table :testings, :use_big_id => true do |t|
+        t.column :name, :string
+      end
+
+      columns = Person.connection.columns(:testings)
+      assert columns.find { |c| c.name == 'id' and c.type == :integer and c.limit == 8} if current_adapter?(:MysqlAdapter)
+      assert columns.find { |c| c.name == 'id' and c.type == :integer and c.limit == 8} if current_adapter?(:SqliteAdapter)
+    ensure
+      Person.connection.drop_table :testings rescue nil      
+    end
+        
-    def test_create_table_with_not_null_column
-      Person.connection.create_table :testings do |t|
-        t.column :foo, :string, :null => false
@@ -178 +190 @@
-      assert_equal TrueClass, bob.male?.class
-    end
-
+    def test_integer_limits
+      Person.delete_all
+      Person.connection.add_column 'people', 'tiny', :integer, :limit => 1
+      Person.connection.add_column 'people', 'small', :integer, :limit => 2
+      Person.connection.add_column 'people', 'medium', :integer, :limit => 3
+      Person.connection.add_column 'people', 'normal', :integer, :limit => 4
+      Person.connection.add_column 'people', 'five_bytes', :integer, :limit => 5
+      Person.connection.add_column 'people', 'big', :integer, :limit => 8
+      Person.connection.add_column 'people', 'ten_bytes', :integer, :limit => 10
+      Person.connection.add_column 'people', 'short_string', :string, :limit => 9
+
+      assert_nothing_raised { Person.create :tiny => 123, :small => 1234, 
+        :medium => 123456, :normal => 123456789, :five_bytes => 123456789123, 
+        :big => 123456789123456789, :ten_bytes => 1208925819614629174706176,
+        :short_string => '123456789'}
+      bob = Person.find(:first)
+        
+      assert_equal 123, bob.tiny
+      assert_equal 1234, bob.small
+      assert_equal 123456, bob.medium
+      assert_equal 123456789, bob.normal
+      assert_equal 123456789123, bob.five_bytes
+      assert_equal 123456789123456789, bob.big
+      # number too big for mysql and should be truncated
+      assert_not_equal 1208925819614629174706176, bob.ten_bytes if current_adapter?(:MysqlAdapter)
+      assert_equal '123456789', bob.short_string
+      
+      if current_adapter?(:MysqlAdapter)
+        person_columns = Person.columns_hash
+        assert_equal 1, person_columns['tiny'].limit
+        assert_equal 2, person_columns['small'].limit
+        assert_equal 3, person_columns['medium'].limit
+        assert_equal 4, person_columns['normal'].limit
+        assert_equal 8, person_columns['five_bytes'].limit # no five-byte type in mysql, use 8-bytes
+        assert_equal 8, person_columns['big'].limit
+        assert_equal 8, person_columns['ten_bytes'].limit
+        assert_equal 9, person_columns['short_string'].limit
+      end
+    end
+        
-    def test_add_remove_single_field_using_string_arguments
-      assert !Person.column_methods_hash.include?(:last_name)
-
@@ -282 +334 @@
-      new_columns = Person.connection.columns(Person.table_name, "#{name} Columns")
-      assert_nil new_columns.find { |c| c.name == 'age' and c.type == :integer }
-      assert new_columns.find { |c| c.name == 'age' and c.type == :string }
-    
+
-
-    def test_change_column_with_new_default
-      Person.connection.add_column "people", "administrator", :boolean, :default => 1
@@ -294 +346 @@
-      assert !Person.new.administrator?
-    end    
-
+    def test_change_integer_column_limits
+      Person.connection.add_column 'people', 'weight', :integer, :limit => 2
+      Person.connection.add_column 'people', 'age', :integer, :limit => 4
+      
+      old_columns = Person.connection.columns(Person.table_name, "#{name} Columns")
+      assert old_columns.find { |c| c.name == 'weight' and c.type == :integer and c.limit == 2}
+      assert old_columns.find { |c| c.name == 'age' and c.type == :integer and c.limit == 4}
+
+      assert_nothing_raised { Person.connection.change_column 'people', 'weight', :integer, :limit => 4 }
+      assert_nothing_raised { Person.connection.change_column 'people', 'age', :integer, :limit => 8 }
+      
+      new_columns = Person.connection.columns(Person.table_name, "#{name} Columns")
+      assert_nil new_columns.find { |c| c.name == 'weight' and c.type == :integer and c.limit == 2}
+      assert_nil new_columns.find { |c| c.name == 'age' and c.type == :integer and c.limit == 4}
+      assert new_columns.find { |c| c.name == 'weight' and c.type == :integer and c.limit == 4 }
+      assert new_columns.find { |c| c.name == 'age' and c.type == :integer and c.limit == 8 }
+    end
+    
-    def test_add_table
-      assert !Reminder.table_exists?
-      

lib/active_record/connection_adapters/abstract/schema_statements.rb

@@ -45 +45 @@
-      # The +options+ hash can include the following keys:
-      # [<tt>:id</tt>]
-      #   Set to true or false to add/not add a primary key column
-
+
+
+
-      # [<tt>:primary_key</tt>]
-      #   The name of the primary key, if one is to be added automatically.
-      #   Defaults to +id+.
@@ -75 +77 @@
-      #    name varchar(80)
-      #  )
-      #
+      # ====== Use the largest integer type supported as the primary key column
+      #  create_table(:objects, :use_big_id => true) do |t|
+      #    t.column :name, :string, :limit => 80
+      #  end
+      # generates (in MySQL):
+      #  CREATE TABLE objects (
+      #    id bigint(21) UNSIGNED DEFAULT NULL auto_increment PRIMARY KEY,
+      #    name varchar(80)
+      #  )
+      #
-      # ====== Do not add a primary key column
-      #  create_table(:categories_suppliers, :id => false) do |t|
-      #    t.column :category_id, :integer
@@ -89 +101 @@
-      # See also TableDefinition#column for details on how to create columns.
-      def create_table(name, options = {})
-        table_definition = TableDefinition.new(self)
-
+, options[:use_big_id] || false
-
-        yield table_definition
-
@@ -254 +266 @@
-
-
-      def type_to_sql(type, limit = nil) #:nodoc:
-
+
+
+
+
+
+
+
+
+
-        limit ||= native[:limit]
-        column_type_sql = native[:name]
-        column_type_sql << "(#{limit})" if limit

lib/active_record/connection_adapters/abstract/schema_definitions.rb

@@ -194 +194 @@
-
-      # Appends a primary key definition to the table definition.
-      # Can be called multiple times, but this is probably not a good idea.
-
-
+
+
+
-      end
-
-      # Returns a ColumnDefinition for the column with name +name+.
@@ -212 +213 @@
-      #
-      # Available options are (none of these exists by default):
-      # * <tt>:limit</tt>:
-
-
+
+
+
+
+
-      # * <tt>:default</tt>:
-      #   The column's default value.  You cannot explicitely set the default
-      #   value to +NULL+.  Simply leave off this option if you want a +NULL+

lib/active_record/connection_adapters/mysql_adapter.rb

@@ -46 +46 @@
-          return :string  if field_type =~ /enum/i
-          super
-        end
+
+        def extract_limit(sql_type)
+          case sql_type
+            when /tinyint/ then return 1
+            when /smallint/ then return 2
+            when /mediumint/ then return 3
+            when /bigint/ then return 8
+            when /int/ then return 4
+          end
+          super
+        end
-    end
-
-    # The MySQL adapter will work with both Ruby/MySQL, which is a Ruby-based MySQL adapter that comes bundled with Active Record, and with
@@ -99 +110 @@
-      def native_database_types #:nodoc
-        {
-          :primary_key => "int(11) DEFAULT NULL auto_increment PRIMARY KEY",
+          :big_primary_key => "bigint(21) UNSIGNED DEFAULT NULL auto_increment PRIMARY KEY",
-          :string      => { :name => "varchar", :limit => 255 },
-          :text        => { :name => "text" },
+          :tinyint     => { :name => "tinyint", :limit => 4 },
+          :smallint    => { :name => "smallint", :limit => 6 },
+          :mediumint   => { :name => "mediumint", :limit => 9 },
-          :integer     => { :name => "int", :limit => 11 },
+          :bigint      => { :name => "bigint", :limit => 21 },
-          :float       => { :name => "float" },
-          :datetime    => { :name => "datetime" },
-          :timestamp   => { :name => "datetime" },
@@ -112 +128 @@
-        }
-      end
-
+      def native_database_type(type, limit=nil)
+        mysql_integer_types = %w{tinyint smallint mediumint int bigint}        
+        if type == :integer
+          native_type = case limit
+                          when nil then native_database_types[:integer]
+                          when 1 then native_database_types[:tinyint]
+                          when 2  then native_database_types[:smallint]
+                          when 3 then native_database_types[:mediumint]
+                          when 4 then native_database_types[:integer]
+                          else native_database_types[:bigint]
+                        end
+        else native_type = native_database_types[type]
+        end
+        type_with_correct_limit = native_type.clone # make a copy so we can change the limit
+        type_with_correct_limit[:limit] = limit unless limit.nil? or mysql_integer_types.include? type_with_correct_limit[:name]
-
+        type_with_correct_limit
+      end
+
-      # QUOTING ==================================================
-
-      def quote(value, column = nil)