From ad0ec07f0076a0eb460332c2a98746864bd15c4c Mon Sep 17 00:00:00 2001
From: kares <self@kares.org>
Date: Wed, 14 May 2014 13:32:03 +0200
Subject: move PostgreSQL's DatabaseStatements out of the PostgreSQLAdapter
 name-space

---
 .../connection_adapters/postgresql/database_statements.rb          | 7 ++++++-
 .../lib/active_record/connection_adapters/postgresql_adapter.rb    | 7 +------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb b/activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb
index 168b08ba75..89a7257d77 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb
@@ -1,6 +1,6 @@
 module ActiveRecord
   module ConnectionAdapters
-    class PostgreSQLAdapter < AbstractAdapter
+    module PostgreSQL
       module DatabaseStatements
         def explain(arel, binds = [])
           sql = "EXPLAIN #{to_sql(arel, binds)}"
@@ -94,6 +94,11 @@ module ActiveRecord
           super.insert
         end
 
+        # The internal PostgreSQL identifier of the money data type.
+        MONEY_COLUMN_TYPE_OID = 790 #:nodoc:
+        # The internal PostgreSQL identifier of the BYTEA data type.
+        BYTEA_COLUMN_TYPE_OID = 17 #:nodoc:
+
         # create a 2D array representing the result set
         def result_as_array(res) #:nodoc:
           # check if we have any binary column and if they need escaping
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index b2bd13b3a0..1f3b0c8dab 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -245,7 +245,7 @@ module ActiveRecord
       include PostgreSQL::Quoting
       include PostgreSQL::ReferentialIntegrity
       include PostgreSQL::SchemaStatements
-      include DatabaseStatements
+      include PostgreSQL::DatabaseStatements
       include Savepoints
 
       # Returns 'PostgreSQL' as adapter name for identification purposes.
@@ -671,11 +671,6 @@ module ActiveRecord
           @statements[sql_key]
         end
 
-        # The internal PostgreSQL identifier of the money data type.
-        MONEY_COLUMN_TYPE_OID = 790 #:nodoc:
-        # The internal PostgreSQL identifier of the BYTEA data type.
-        BYTEA_COLUMN_TYPE_OID = 17 #:nodoc:
-
         # Connects to a PostgreSQL server and sets up the adapter depending on the
         # connected server's characteristics.
         def connect
-- 
cgit v1.2.3