diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-08-29 13:38:10 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-08-29 13:38:10 -0700 |
| commit | cebff6d0f77f6a9a47f7fa387255c7f2839d4fb0 (patch) | |
| tree | 0788191058fdbb63cc0865394474474f220658dc /activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | |
| parent | c59c9bb8bc275a2be8695d4d431a0512d29353f1 (diff) | |
| parent | a982443ae5bd12535405dbdb40f27df2d612256e (diff) | |
| download | rails-cebff6d0f77f6a9a47f7fa387255c7f2839d4fb0.tar.gz rails-cebff6d0f77f6a9a47f7fa387255c7f2839d4fb0.tar.bz2 rails-cebff6d0f77f6a9a47f7fa387255c7f2839d4fb0.zip | |
Merge pull request #2021 from dasch/more_postgres_utils
Make #extract_schema_and_table an instance method in Utils
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index 45c13bdcd6..ba4a6c7a78 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -954,6 +954,8 @@ module ActiveRecord end module Utils + extend self + # Returns an array of <tt>[schema_name, table_name]</tt> extracted from +name+. # +schema_name+ is nil if not specified in +name+. # +schema_name+ and +table_name+ exclude surrounding quotes (regardless of whether provided in +name+) @@ -964,7 +966,7 @@ module ActiveRecord # * <tt>schema_name.table_name</tt> # * <tt>schema_name."table.name"</tt> # * <tt>"schema.name"."table name"</tt> - def self.extract_schema_and_table(name) + def extract_schema_and_table(name) table, schema = name.scan(/[^".\s]+|"[^"]*"/)[0..1].collect{|m| m.gsub(/(^"|"$)/,'') }.reverse [schema, table] end |