diff options
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/schema_dumper.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index a115291101..e7bedaee9e 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -355,7 +355,7 @@ module ActiveRecord when /^real|^money/i then 'float' when /^interval/i then 'string' # geometric types (the line type is currently not implemented in postgresql) - when /^point|lseg|box|path|polygon|circle/i then 'string' + when /^(?:point|lseg|box|"?path"?|polygon|circle)/i then 'string' when /^bytea/i then 'binary' else field_type # Pass through standard types. end diff --git a/activerecord/lib/active_record/schema_dumper.rb b/activerecord/lib/active_record/schema_dumper.rb index f4ce67e9aa..cd6a665a8c 100644 --- a/activerecord/lib/active_record/schema_dumper.rb +++ b/activerecord/lib/active_record/schema_dumper.rb @@ -59,7 +59,7 @@ HEADER columns.each do |column| next if column.name == "id" stream.print " t.column #{column.name.inspect}, #{column.type.inspect}" - stream.print ", :limit => #{column.limit.inspect}" if column.limit != @types[column.type][:limit] + stream.print ", :limit => #{column.limit.inspect}" if column.limit != @types[column.type][:limit] stream.print ", :default => #{column.default.inspect}" if !column.default.nil? stream.print ", :null => false" if !column.null stream.puts |