diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-23 15:02:05 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-23 15:02:05 -0300 |
| commit | b4cce0760af85119a7953953a6219833c3d06260 (patch) | |
| tree | 3f40a2de641f6c3cc71f506d8aba909e8766dc54 /activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb | |
| parent | fbdcba86cf0a174ddcc8b913db703c5e69d77f9f (diff) | |
| parent | adb881979a2ee295368c3500a300b438396a9d0b (diff) | |
| download | rails-b4cce0760af85119a7953953a6219833c3d06260.tar.gz rails-b4cce0760af85119a7953953a6219833c3d06260.tar.bz2 rails-b4cce0760af85119a7953953a6219833c3d06260.zip | |
Merge pull request #15280 from sgrif/sg-postgres-defaults
Move parsing of PG sql strings for defaults out of column
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.rb | 4 |
1 files changed, 3 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 c04a1d7178..9e53d10bb4 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,9 @@ 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) - PostgreSQLColumn.new(column_name, default, oid, type, notnull == 'f') + default_value = extract_value_from_default(default) + default_function = extract_default_function(default_value, default) + PostgreSQLColumn.new(column_name, default_value, oid, type, notnull == 'f', default_function) end end |