diff options
| author | Arturo Pie <arturotd08@yahoo.ca> | 2012-10-13 19:29:23 -0400 |
|---|---|---|
| committer | Arturo Pie <arturotd08@yahoo.ca> | 2012-10-13 22:18:50 -0400 |
| commit | 8fb841bddefbd2b7ad6b3d7b560111ef0d7fefda (patch) | |
| tree | d94e7ba297ba47b1aaf60e7ddc363b366a3c665d /activerecord/lib | |
| parent | 40475cf3649af4a6d868299b1796b36358f90917 (diff) | |
| download | rails-8fb841bddefbd2b7ad6b3d7b560111ef0d7fefda.tar.gz rails-8fb841bddefbd2b7ad6b3d7b560111ef0d7fefda.tar.bz2 rails-8fb841bddefbd2b7ad6b3d7b560111ef0d7fefda.zip | |
#7914 Remove code for unsupported postgreSQL version.
Remove parsing of character type default values for 8.1 formatting since
Rails doesn't support postgreSQL 8.1 anymore.
Remove misleading comment unrelated to code.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb | 3 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 3 |
2 files changed, 0 insertions, 6 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 0f5431ee37..7cad8f94cf 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb @@ -280,9 +280,6 @@ module ActiveRecord end_sql if result.nil? or result.empty? - # If that fails, try parsing the primary key's default value. - # Support the 7.x and 8.0 nextval('foo'::text) as well as - # the 8.1+ nextval('foo'::regclass). result = query(<<-end_sql, 'SCHEMA')[0] SELECT attr.attname, CASE diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index 0a5b1463c5..e18464fa35 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -80,9 +80,6 @@ module ActiveRecord # Character types when /\A\(?'(.*)'::.*\b(?:character varying|bpchar|text)\z/m $1 - # Character types (8.1 formatting) - when /\AE'(.*)'::(?:character varying|bpchar|text)\z/m - $1.gsub(/\\(\d\d\d)/) { $1.oct.chr } # Binary data types when /\A'(.*)'::bytea\z/m $1 |