Permalink
Browse files

Revert "primary_key now supports :limit for MySQL". Break Sam Ruby app.

To reproduce, start a new application, create a scaffold and run test suite. [#876 state:open]

This reverts commit faeca69.
  • Loading branch information...
josevalim committed Mar 27, 2010
1 parent 46b7704 commit ff522cf4bcb31420baee62aa3c24c98959d80cdf
@@ -274,7 +274,7 @@ def to_sql
column_options = {}
column_options[:null] = null unless null.nil?
column_options[:default] = default unless default.nil?
- add_column_options!(column_sql, column_options)
+ add_column_options!(column_sql, column_options) unless type.to_sym == :primary_key
column_sql
end
@@ -334,8 +334,8 @@ def xml_column_fallback(*args)
# Appends a primary key definition to the table definition.
# Can be called multiple times, but this is probably not a good idea.
- def primary_key(name, options = {})
- column(name, :primary_key, options)
+ def primary_key(name)
+ column(name, :primary_key)
end
# Returns a ColumnDefinition for the column with name +name+.
@@ -357,7 +357,7 @@ def [](name)
#
# Available options are (none of these exists by default):
# * <tt>:limit</tt> -
- # Requests a maximum column length. This is number of characters for <tt>:string</tt> and <tt>:text</tt> columns and number of bytes for :binary, :integer and :primary_key columns.
+ # Requests a maximum column length. This is number of characters for <tt>:string</tt> and <tt>:text</tt> columns and number of bytes for :binary and :integer columns.
# * <tt>:default</tt> -
# The column's default value. Use nil for NULL.
# * <tt>:null</tt> -
@@ -183,7 +183,7 @@ class MysqlAdapter < AbstractAdapter
QUOTED_TRUE, QUOTED_FALSE = '1'.freeze, '0'.freeze
NATIVE_DATABASE_TYPES = {
- :primary_key => { :name => "DEFAULT NULL auto_increment PRIMARY KEY", :limit => 4 },
+ :primary_key => "int(11) DEFAULT NULL auto_increment PRIMARY KEY".freeze,
:string => { :name => "varchar", :limit => 255 },
:text => { :name => "text" },
:integer => { :name => "int", :limit => 4 },
@@ -541,21 +541,15 @@ def rename_column(table_name, column_name, new_column_name) #:nodoc:
# Maps logical Rails types to MySQL-specific data types.
def type_to_sql(type, limit = nil, precision = nil, scale = nil)
- case type.to_s
- when 'primary_key'
- native = native_database_types[:primary_key]
- return type_to_sql('integer', limit) + ' ' + native[:name]
- when 'integer'
- case limit
- when 1; 'tinyint'
- when 2; 'smallint'
- when 3; 'mediumint'
- when nil, 4, 11; 'int(11)' # compatibility with MySQL default
- when 5..8; 'bigint'
- else raise(ActiveRecordError, "No integer type has byte size #{limit}")
- end
- else
- super
+ return super unless type.to_s == 'integer'
+
+ case limit
+ when 1; 'tinyint'
+ when 2; 'smallint'
+ when 3; 'mediumint'
+ when nil, 4, 11; 'int(11)' # compatibility with MySQL default
+ when 5..8; 'bigint'
+ else raise(ActiveRecordError, "No integer type has byte size #{limit}")
end
end
@@ -76,7 +76,6 @@ def tables(stream)
def table(table, stream)
columns = @connection.columns(table)
begin
- column_specs = columns.dup
tbl = StringIO.new
# first dump primary key column
@@ -87,12 +86,9 @@ def table(table, stream)
end
tbl.print " create_table #{table.inspect}"
- if pkc = column_specs.detect { |c| c.name == pk }
- if pkc.limit != @types[:primary_key][:limit]
- tbl.print ", :id => false"
- else
- column_specs.delete(pkc)
- tbl.print %Q(, :primary_key => "#{pk}") if pk != 'id'
+ if columns.detect { |c| c.name == pk }
+ if pk != 'id'
+ tbl.print %Q(, :primary_key => "#{pk}")
end
else
tbl.print ", :id => false"
@@ -101,29 +97,27 @@ def table(table, stream)
tbl.puts " do |t|"
# then dump all non-primary key columns
- column_specs.map! do |column|
+ column_specs = columns.map do |column|
raise StandardError, "Unknown type '#{column.sql_type}' for column '#{column.name}'" if @types[column.type].nil?
+ next if column.name == pk
spec = {}
spec[:name] = column.name.inspect
+
+ # AR has an optimisation which handles zero-scale decimals as integers. This
+ # code ensures that the dumper still dumps the column as a decimal.
+ spec[:type] = if column.type == :integer && [/^numeric/, /^decimal/].any? { |e| e.match(column.sql_type) }
+ 'decimal'
+ else
+ column.type.to_s
+ end
spec[:limit] = column.limit.inspect if column.limit != @types[column.type][:limit] && spec[:type] != 'decimal'
- if column.name == pk
- spec[:type] = 'primary_key'
- else
- # AR has an optimisation which handles zero-scale decimals as integers. This
- # code ensures that the dumper still dumps the column as a decimal.
- spec[:type] = if column.type == :integer && [/^numeric/, /^decimal/].any? { |e| e.match(column.sql_type) }
- 'decimal'
- else
- column.type.to_s
- end
- spec[:precision] = column.precision.inspect if !column.precision.nil?
- spec[:scale] = column.scale.inspect if !column.scale.nil?
- spec[:null] = 'false' if !column.null
- spec[:default] = default_string(column.default) if column.has_default?
- end
+ spec[:precision] = column.precision.inspect if !column.precision.nil?
+ spec[:scale] = column.scale.inspect if !column.scale.nil?
+ spec[:null] = 'false' if !column.null
+ spec[:default] = default_string(column.default) if column.has_default?
(spec.keys - [:name, :type]).each{ |k| spec[k].insert(0, "#{k.inspect} => ")}
spec
- end
+ end.compact
# find all migration keys used in this table
keys = [:name, :limit, :precision, :scale, :default, :null] & column_specs.map(&:keys).flatten
@@ -45,7 +45,7 @@ def test_types_line_up
next if column_set.empty?
lengths = column_set.map do |column|
- if match = column.match(/t\.(?:integer|decimal|float|datetime|timestamp|time|date|text|binary|string|boolean|primary_key)\s+"/)
+ if match = column.match(/t\.(?:integer|decimal|float|datetime|timestamp|time|date|text|binary|string|boolean)\s+"/)
match[0].length
end
end
@@ -186,13 +186,6 @@ def test_schema_dump_includes_length_for_mysql_blob_and_text_fields
assert_match %r{t.text\s+"medium_text",\s+:limit => 16777215$}, output
assert_match %r{t.text\s+"long_text",\s+:limit => 2147483647$}, output
end
-
- def test_mysql_schema_dump_should_honor_primary_keys_limits
- output = standard_dump
- match = output.match(%r{create_table "primary_key_limit",.*?:id => false\b.*? do (.*?)\bend$}m)
- assert_not_nil(match, output)
- assert_match %r(t.primary_key\s+"id",\s+:limit => \d+$), match[1], "limit option not found on primary key"
- end
end
def test_schema_dump_includes_decimal_options
@@ -218,7 +211,7 @@ def test_schema_dump_keeps_large_precision_integer_columns_as_decimal
if current_adapter?(:OracleAdapter)
assert_match %r{t.integer\s+"atoms_in_universe",\s+:precision => 38,\s+:scale => 0}, output
else
- assert_match %r{t.decimal\s+"atoms_in_universe",\s+:limit => 55,\s+:precision => 55,\s+:scale => 0}, output
+ assert_match %r{t.decimal\s+"atoms_in_universe",\s+:precision => 55,\s+:scale => 0}, output
end
end
@@ -394,10 +394,6 @@ def create_table(*args, &block)
t.integer :price
end
- create_table :primary_key_limit, :force => true, :id => false do |t|
- t.primary_key :id, :limit => 8
- end
-
create_table :projects, :force => true do |t|
t.string :name
t.string :type

0 comments on commit ff522cf

Please sign in to comment.