review Postgres' SchemaCreation to match our convention

Author: kares

lib/arjdbc/postgresql/adapter.rb

@@ -11,6 +11,7 @@ module PostgreSQL
 
     require 'arjdbc/postgresql/column'
     require 'arjdbc/postgresql/explain_support'
+    require 'arjdbc/postgresql/schema_creation' # AR 4.x
 
     # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_connection_class
     def self.jdbc_connection_class
@@ -250,13 +251,6 @@ def migration_keys
       super + [:array]
     end if AR4_COMPAT
 
-    if ActiveRecord::VERSION::MAJOR > 3
-
-    require 'arjdbc/postgresql/schema_creation'
-    def schema_creation; SchemaCreation.new(self); end
-
-    end
-
     # Enable standard-conforming strings if available.
     def set_standard_conforming_strings
       self.standard_conforming_strings=(true)
@@ -975,7 +969,7 @@ def add_column(table_name, column_name, type, options = {})
 
       change_column_default(table_name, column_name, default) if options_include_default?(options)
       change_column_null(table_name, column_name, false, default) if notnull
-    end
+    end if ActiveRecord::VERSION::MAJOR < 4
 
     # Changes the column of a table.
     def change_column(table_name, column_name, type, options = {})
@@ -1004,24 +998,24 @@ def change_column(table_name, column_name, type, options = {})
 
       change_column_default(table_name, column_name, options[:default]) if options_include_default?(options)
       change_column_null(table_name, column_name, options[:null], options[:default]) if options.key?(:null)
-    end
+    end # unless const_defined? :SchemaCreation
 
     # Changes the default value of a table column.
     def change_column_default(table_name, column_name, default)
       execute "ALTER TABLE #{quote_table_name(table_name)} ALTER COLUMN #{quote_column_name(column_name)} SET DEFAULT #{quote(default)}"
-    end
+    end # unless const_defined? :SchemaCreation
 
     def change_column_null(table_name, column_name, null, default = nil)
       unless null || default.nil?
         execute("UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)}=#{quote(default)} WHERE #{quote_column_name(column_name)} IS NULL")
       end
       execute("ALTER TABLE #{quote_table_name(table_name)} ALTER #{quote_column_name(column_name)} #{null ? 'DROP' : 'SET'} NOT NULL")
-    end
+    end # unless const_defined? :SchemaCreation
 
     def rename_column(table_name, column_name, new_column_name)
       execute "ALTER TABLE #{quote_table_name(table_name)} RENAME COLUMN #{quote_column_name(column_name)} TO #{quote_column_name(new_column_name)}"
       rename_column_indexes(table_name, column_name, new_column_name) if respond_to?(:rename_column_indexes) # AR-4.0 SchemaStatements
-    end
+    end # unless const_defined? :SchemaCreation
 
     def add_index(table_name, column_name, options = {})
       index_name, index_type, index_columns, index_options, index_algorithm, index_using = add_index_options(table_name, column_name, options)

lib/arjdbc/postgresql/schema_creation.rb

@@ -1,7 +1,7 @@
-# NOTE: kindly borrowed from AR 4.0.0 (rc1) - only to be used on AR >= 4.0 !
 module ArJdbc
   module PostgreSQL
-    class SchemaCreation < ActiveRecord::ConnectionAdapters::AbstractAdapter::SchemaCreation
+    # @private copied from native adapter 4.0/4.1
+    class SchemaCreation < ::ActiveRecord::ConnectionAdapters::AbstractAdapter::SchemaCreation
 
       private
 
@@ -32,7 +32,11 @@ def add_column_options!(sql, options)
           super
         end
       end
+    end
 
+    def schema_creation
+      SchemaCreation.new self
     end
+
   end
-end
+end if ::ActiveRecord::ConnectionAdapters::AbstractAdapter.const_defined? :SchemaCreation