aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2014-05-30 13:48:05 +0200
committerYves Senn <yves.senn@gmail.com>2014-05-30 13:48:05 +0200
commitb9eeb0339df7bd746273d680a26258df78dbd262 (patch)
tree14f7f0a2c23f4da975711173843e34bdf9c0bf8b /activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
parentd6c1205584b1ba597db4071b168681678b1e9875 (diff)
downloadrails-b9eeb0339df7bd746273d680a26258df78dbd262.tar.gz
rails-b9eeb0339df7bd746273d680a26258df78dbd262.tar.bz2
rails-b9eeb0339df7bd746273d680a26258df78dbd262.zip
pg, support default values for enum types. Closes #7814.
This is an intermediate solution. It is related to the refactoring @sgrif is making and will change in the future.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
index 09db337a82..b2aeb3a058 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
@@ -179,7 +179,7 @@ module ActiveRecord
# Limit, precision, and scale are all handled by the superclass.
column_definitions(table_name).map do |column_name, type, default, notnull, oid, fmod|
oid = get_oid_type(oid.to_i, fmod.to_i, column_name, type)
- default_value = extract_value_from_default(default)
+ default_value = extract_value_from_default(oid, default)
default_function = extract_default_function(default_value, default)
new_column(column_name, default_value, oid, type, notnull == 'f', default_function)
end