Skip to content
Browse files

primary_key now supports :limit. [#876 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
  • Loading branch information...
1 parent 68ade93 commit 41e5c7ed44fedb95636ef9b7a792c46ea03309bd @rizwanreza rizwanreza committed with wycats
View
8 activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
@@ -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) unless type.to_sym == :primary_key
+ add_column_options!(column_sql, column_options)
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)
- column(name, :primary_key)
+ def primary_key(name, options = {})
+ column(name, :primary_key, options)
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 and :integer 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, :integer and :primary_key columns.
# * <tt>:default</tt> -
# The column's default value. Use nil for NULL.
# * <tt>:null</tt> -
View
26 activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -183,7 +183,7 @@ class MysqlAdapter < AbstractAdapter
QUOTED_TRUE, QUOTED_FALSE = '1'.freeze, '0'.freeze
NATIVE_DATABASE_TYPES = {
- :primary_key => "int(11) DEFAULT NULL auto_increment PRIMARY KEY".freeze,
+ :primary_key => { :name => "DEFAULT NULL auto_increment PRIMARY KEY", :limit => 4 },
:string => { :name => "varchar", :limit => 255 },
:text => { :name => "text" },
:integer => { :name => "int", :limit => 4 },
@@ -541,15 +541,21 @@ 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)
- 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}")
+ case type.to_s
+ when 'primary_key':
+ native = native_database_types[:primary_key]
+ return type_to_sql('integer', limit) + ' ' + native[:name]
+ when 'integer':

This triggers an error with ruby 1.9.1p376:

.bundle/ruby/1.9.1/bundler/gems/rails-16a5e918a06649ffac24fd5873b875daf66212ad-master/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb:548: syntax error, unexpected keyword_when, expecting keyword_end
    when 'integer':

Fix is to remove the colons:

when 'primary_key'
.....
when 'integer'
....
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
+ 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
end
end
View
42 activerecord/lib/active_record/schema_dumper.rb
@@ -76,6 +76,7 @@ def tables(stream)
def table(table, stream)
columns = @connection.columns(table)
begin
+ column_specs = columns.dup
tbl = StringIO.new
# first dump primary key column
@@ -86,9 +87,12 @@ def table(table, stream)
end
tbl.print " create_table #{table.inspect}"
- if columns.detect { |c| c.name == pk }
- if pk != 'id'
- tbl.print %Q(, :primary_key => "#{pk}")
+ 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'
end
else
tbl.print ", :id => false"
@@ -97,27 +101,29 @@ def table(table, stream)
tbl.puts " do |t|"
# then dump all non-primary key columns
- column_specs = columns.map do |column|
+ column_specs.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'
- 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?
+ 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.keys - [:name, :type]).each{ |k| spec[k].insert(0, "#{k.inspect} => ")}
spec
- end.compact
+ end
# find all migration keys used in this table
keys = [:name, :limit, :precision, :scale, :default, :null] & column_specs.map(&:keys).flatten
View
11 activerecord/test/cases/schema_dumper_test.rb
@@ -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)\s+"/)
+ if match = column.match(/t\.(?:integer|decimal|float|datetime|timestamp|time|date|text|binary|string|boolean|primary_key)\s+"/)
match[0].length
end
end
@@ -169,6 +169,13 @@ def test_schema_dump_should_honor_nonstandard_primary_keys
assert_match %r(:primary_key => "movieid"), match[1], "non-standard primary key not preserved"
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
+
if current_adapter?(:MysqlAdapter)
def test_schema_dump_should_not_add_default_value_for_mysql_text_field
output = standard_dump
@@ -211,7 +218,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+:precision => 55,\s+:scale => 0}, output
+ assert_match %r{t.decimal\s+"atoms_in_universe",\s+:limit => 55,\s+:precision => 55,\s+:scale => 0}, output
end
end
View
4 activerecord/test/schema/schema.rb
@@ -394,6 +394,10 @@ 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 41e5c7e

Please sign in to comment.
Something went wrong with that request. Please try again.