From f8c4b374c831d6f37efb7b7685fe1d8fe101e096 Mon Sep 17 00:00:00 2001
From: Paul Gallagher <gallagher.paul@gmail.com>
Date: Sat, 11 Jun 2011 18:34:09 +0800
Subject: make extract_schema_and_table a private method

---
 .../connection_adapters/postgresql_adapter.rb      | 37 ++++++++++------------
 1 file changed, 17 insertions(+), 20 deletions(-)

(limited to 'activerecord/lib/active_record/connection_adapters')

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 03a9624357..b6e7ddfc5b 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -673,8 +673,8 @@ module ActiveRecord
         schema, table = extract_schema_and_table(name.to_s)
         return false unless table
 
-        binds = [[nil, table.gsub(/(^"|"$)/,'')]]
-        binds << [nil, schema.gsub(/(^"|"$)/,'')] if schema
+        binds = [[nil, table]]
+        binds << [nil, schema] if schema
 
         exec_query(<<-SQL, 'SCHEMA', binds).rows.first[0].to_i > 0
           SELECT COUNT(*)
@@ -693,24 +693,6 @@ module ActiveRecord
         SQL
       end
 
-      # Returns an array of [schema_name, table_name] extracted from +name+.
-      # The schema_name will be nil if not provided in +name+.
-      # Quotes are preserved in the schema and table name components if provided.
-      # Valid combinations for quoting the schema and table names:
-      #
-      # - table_name
-      # - "table.name"
-      # - schema_name.table_name
-      # - schema_name."table.name"
-      # - "schema.name".table_name
-      # - "schema.name"."table_name"
-      # - "schema.name"."table.name"
-      def extract_schema_and_table(name)
-        name[/([^"\.\s]+|"[^"]+")(?:\.([^"\.\s]+|"[^"]*"))?/]
-        table, schema = [$1,$2].compact.reverse
-        [schema, table]
-      end
-
       # Returns an array of indexes for the given table.
       def indexes(table_name, name = nil)
          schemas = schema_search_path.split(/,/).map { |p| quote(p) }.join(',')
@@ -1101,6 +1083,21 @@ module ActiveRecord
           end
         end
 
+        # 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+)
+        # +name+ supports the range of schema/table references understood by PostgreSQL, for example:
+        #
+        # * <tt>table_name</tt>
+        # * <tt>"table.name"</tt>
+        # * <tt>schema_name.table_name</tt>
+        # * <tt>schema_name."table.name"</tt>
+        # * <tt>"schema.name"."table name"</tt>
+        def extract_schema_and_table(name)
+          table, schema = name.scan(/[^".\s]+|"[^"]*"/)[0..1].collect{|m| m.gsub(/(^"|"$)/,'') }.reverse
+          [schema, table]
+        end
+
         def extract_table_ref_from_insert_sql(sql)
           sql[/into\s+([^\(]*).*values\s*\(/i]
           $1.strip if $1
-- 
cgit v1.2.3