aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorMarcel Molina <marcel@vernix.org>2005-10-09 01:22:47 +0000
committerMarcel Molina <marcel@vernix.org>2005-10-09 01:22:47 +0000
commit64cd4e417059f363a55023d28b05f9e0d349e3f9 (patch)
tree394903c093d3e386b9dc019aa2104489b46b29af /activerecord
parente30699f66034405de0eaaad12066c2c7d266762f (diff)
downloadrails-64cd4e417059f363a55023d28b05f9e0d349e3f9.tar.gz
rails-64cd4e417059f363a55023d28b05f9e0d349e3f9.tar.bz2
rails-64cd4e417059f363a55023d28b05f9e0d349e3f9.zip
PostgreSQL returns the path type wrapped in quotes.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2499 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb2
-rw-r--r--activerecord/lib/active_record/schema_dumper.rb2
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