Merge pull request #2012 from dasch/refactor_postgres_adapter

Refactor PostgreSQLAdapter a bit

activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -670,7 +670,7 @@ def tables(name = nil)
       # If the schema is not specified as part of +name+ then it will only find tables within
       # the current schema search path (regardless of permissions to access tables in other schemas)
       def table_exists?(name)
-        schema, table = extract_schema_and_table(name.to_s)
+        schema, table = Utils.extract_schema_and_table(name.to_s)
         return false unless table
 
         binds = [[nil, table]]
@@ -947,6 +947,23 @@ def distinct(columns, orders) #:nodoc:
         "DISTINCT #{columns}, #{order_columns * ', '}"
       end
 
+      module Utils
+        # 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 self.extract_schema_and_table(name)
+          table, schema = name.scan(/[^".\s]+|"[^"]*"/)[0..1].collect{|m| m.gsub(/(^"|"$)/,'') }.reverse
+          [schema, table]
+        end
+      end
+
       protected
         # Returns the version of the connected PostgreSQL server.
         def postgresql_version
@@ -1085,21 +1102,6 @@ def extract_pg_identifier_from_name(name)
           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

activerecord/test/cases/adapters/postgresql/schema_test.rb

@@ -229,8 +229,8 @@ def test_extract_schema_and_table
       %("schema"."table_name") => %w{schema table_name},
       %("even spaces".table)   => ['even spaces','table'],
       %(schema."table.name")   => ['schema', 'table.name']
-    }.each do |given,expect|
-      assert_equal expect, @connection.send(:extract_schema_and_table, given)
+    }.each do |given, expect|
+      assert_equal expect, ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::Utils.extract_schema_and_table(given)
     end
   end