From: Tom Hughes <tom@compton.nu>
Date: Thu, 5 Jan 2012 18:18:22 +0000 (+0000)
Subject: Don't try and monkey patch database drivers that aren't loaded
X-Git-Tag: live~5872
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/294b098a0d3d0774e4caa39ff426a7a0f3bad53a?ds=sidebyside

Don't try and monkey patch database drivers that aren't loaded
---

diff --git a/lib/migrate.rb b/lib/migrate.rb
index 3d9970d8c..e30d071cd 100644
--- a/lib/migrate.rb
+++ b/lib/migrate.rb
@@ -17,8 +17,8 @@ module ActiveRecord
 
       def add_foreign_key(table_name, column_name, reftbl, refcol = nil)
         execute "ALTER TABLE #{table_name} ADD " +
-	  "FOREIGN KEY (#{quote_column_names(column_name)}) " +
-	  "REFERENCES #{reftbl} (#{quote_column_names(refcol || column_name)})"
+          "FOREIGN KEY (#{quote_column_names(column_name)}) " +
+          "REFERENCES #{reftbl} (#{quote_column_names(refcol || column_name)})"
       end
 
       def remove_foreign_key(table_name, column_name, reftbl, refcol = nil)
@@ -42,166 +42,170 @@ module ActiveRecord
       end
     end
 
-    class MysqlAdapter
-      alias_method :old_native_database_types, :native_database_types
-
-      def native_database_types
-        types = old_native_database_types
-        types[:bigint] = { :name => "bigint", :limit => 20 }
-        types[:double] = { :name => "double" }
-        types[:integer_pk] = { :name => "integer DEFAULT NULL auto_increment PRIMARY KEY" }
-        types[:bigint_pk] = { :name => "bigint(20) DEFAULT NULL auto_increment PRIMARY KEY" }
-        types[:bigint_pk_64] = { :name => "bigint(64) DEFAULT NULL auto_increment PRIMARY KEY" }
-        types[:bigint_auto_64] = { :name => "bigint(64) DEFAULT NULL auto_increment" }
-        types[:bigint_auto_11] = { :name => "bigint(11) DEFAULT NULL auto_increment" }
-        types[:bigint_auto_20] = { :name => "bigint(20) DEFAULT NULL auto_increment" }
-        types[:four_byte_unsigned] = { :name=> "integer unsigned" }
-        types[:inet] = { :name=> "integer unsigned" }
+    if defined?(ActiveRecord::ConnectionAdapters::MysqlAdapter)
+      class MysqlAdapter
+        alias_method :old_native_database_types, :native_database_types
+
+        def native_database_types
+          types = old_native_database_types
+          types[:bigint] = { :name => "bigint", :limit => 20 }
+          types[:double] = { :name => "double" }
+          types[:integer_pk] = { :name => "integer DEFAULT NULL auto_increment PRIMARY KEY" }
+          types[:bigint_pk] = { :name => "bigint(20) DEFAULT NULL auto_increment PRIMARY KEY" }
+          types[:bigint_pk_64] = { :name => "bigint(64) DEFAULT NULL auto_increment PRIMARY KEY" }
+          types[:bigint_auto_64] = { :name => "bigint(64) DEFAULT NULL auto_increment" }
+          types[:bigint_auto_11] = { :name => "bigint(11) DEFAULT NULL auto_increment" }
+          types[:bigint_auto_20] = { :name => "bigint(20) DEFAULT NULL auto_increment" }
+          types[:four_byte_unsigned] = { :name=> "integer unsigned" }
+          types[:inet] = { :name=> "integer unsigned" }
+
+          enumerations.each do |e,v|
+            types[e.to_sym]= { :name => "enum('#{v.join '\',\''}')" }
+          end
 
-        enumerations.each do |e,v|
-          types[e.to_sym]= { :name => "enum('#{v.join '\',\''}')" }
+          types
         end
 
-        types
-      end
-
-      def change_column(table_name, column_name, type, options = {})
-        unless options_include_default?(options)
-          options[:default] = select_one("SHOW COLUMNS FROM #{table_name} LIKE '#{column_name}'")["Default"]
+        def change_column(table_name, column_name, type, options = {})
+          unless options_include_default?(options)
+            options[:default] = select_one("SHOW COLUMNS FROM #{table_name} LIKE '#{column_name}'")["Default"]
 
-          unless type == :string or type == :text
-            options.delete(:default) if options[:default] = "";
+            unless type == :string or type == :text
+              options.delete(:default) if options[:default] = "";
+            end
           end
-        end
 
-        change_column_sql = "ALTER TABLE #{table_name} CHANGE #{column_name} #{column_name} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
-        add_column_options!(change_column_sql, options)
-        execute(change_column_sql) 
-      end
+          change_column_sql = "ALTER TABLE #{table_name} CHANGE #{column_name} #{column_name} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
+          add_column_options!(change_column_sql, options)
+          execute(change_column_sql)
+        end
 
-      def myisam_table
-        return { :id => false, :force => true, :options => "ENGINE=MyIsam" }
-      end
+        def myisam_table
+          return { :id => false, :force => true, :options => "ENGINE=MyIsam" }
+        end
 
-      def innodb_table
-        return { :id => false, :force => true, :options => "ENGINE=InnoDB" }
-      end
+        def innodb_table
+          return { :id => false, :force => true, :options => "ENGINE=InnoDB" }
+        end
 
-      def innodb_option
-        return "ENGINE=InnoDB"
-      end
+        def innodb_option
+          return "ENGINE=InnoDB"
+        end
 
-      def change_engine (table_name, engine)
-        execute "ALTER TABLE #{table_name} ENGINE = #{engine}"
-      end
+        def change_engine (table_name, engine)
+          execute "ALTER TABLE #{table_name} ENGINE = #{engine}"
+        end
 
-      def add_fulltext_index (table_name, column)
-        execute "CREATE FULLTEXT INDEX `#{table_name}_#{column}_idx` ON `#{table_name}` (`#{column}`)"
-      end
+        def add_fulltext_index (table_name, column)
+          execute "CREATE FULLTEXT INDEX `#{table_name}_#{column}_idx` ON `#{table_name}` (`#{column}`)"
+        end
 
-      def enumerations
-        @enumerations ||= Hash.new
-      end
+        def enumerations
+          @enumerations ||= Hash.new
+        end
 
-      def create_enumeration (enumeration_name, values)
-        enumerations[enumeration_name] = values
-      end
+        def create_enumeration (enumeration_name, values)
+          enumerations[enumeration_name] = values
+        end
 
-      def drop_enumeration (enumeration_name)
-        enumerations.delete(enumeration_name)
-      end
+        def drop_enumeration (enumeration_name)
+          enumerations.delete(enumeration_name)
+        end
 
-      def alter_primary_key(table_name, new_columns)
-        execute("alter table #{table_name} drop primary key, add primary key (#{new_columns.join(',')})")
-      end
+        def alter_primary_key(table_name, new_columns)
+          execute("alter table #{table_name} drop primary key, add primary key (#{new_columns.join(',')})")
+        end
 
-      def interval_constant(interval)
-        "'#{interval}'"
+        def interval_constant(interval)
+          "'#{interval}'"
+        end
       end
     end
 
-    class PostgreSQLAdapter
-      alias_method :old_native_database_types, :native_database_types
+    if defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+      class PostgreSQLAdapter
+        alias_method :old_native_database_types, :native_database_types
+
+        def native_database_types
+          types = old_native_database_types
+          types[:double] = { :name => "double precision" }
+          types[:integer_pk] = { :name => "serial PRIMARY KEY" }
+          types[:bigint_pk] = { :name => "bigserial PRIMARY KEY" }
+          types[:bigint_pk_64] = { :name => "bigserial PRIMARY KEY" }
+          types[:bigint_auto_64] = { :name => "bigint" } #fixme: need autoincrement?
+          types[:bigint_auto_11] = { :name => "bigint" } #fixme: need autoincrement?
+          types[:bigint_auto_20] = { :name => "bigint" } #fixme: need autoincrement?
+          types[:four_byte_unsigned] = { :name => "bigint" } # meh
+          types[:inet] = { :name=> "inet" }
+
+          enumerations.each_key do |e|
+            types[e.to_sym]= { :name => e }
+          end
 
-      def native_database_types
-        types = old_native_database_types
-        types[:double] = { :name => "double precision" }
-        types[:integer_pk] = { :name => "serial PRIMARY KEY" }
-        types[:bigint_pk] = { :name => "bigserial PRIMARY KEY" }
-        types[:bigint_pk_64] = { :name => "bigserial PRIMARY KEY" }
-        types[:bigint_auto_64] = { :name => "bigint" } #fixme: need autoincrement?
-        types[:bigint_auto_11] = { :name => "bigint" } #fixme: need autoincrement?
-        types[:bigint_auto_20] = { :name => "bigint" } #fixme: need autoincrement?
-        types[:four_byte_unsigned] = { :name => "bigint" } # meh
-        types[:inet] = { :name=> "inet" }
+          types
+        end
 
-        enumerations.each_key do |e|
-          types[e.to_sym]= { :name => e }
+        def myisam_table
+          return { :id => false, :force => true, :options => ""}
         end
 
-        types
-      end
+        def innodb_table
+          return { :id => false, :force => true, :options => ""}
+        end
 
-      def myisam_table
-        return { :id => false, :force => true, :options => ""}
-      end
+        def innodb_option
+          return ""
+        end
 
-      def innodb_table
-        return { :id => false, :force => true, :options => ""}
-      end
+        def change_engine (table_name, engine)
+        end
 
-      def innodb_option
-        return ""
-      end
- 
-      def change_engine (table_name, engine)
-      end
+        def add_fulltext_index (table_name, column)
+          execute "CREATE INDEX #{table_name}_#{column}_idx on #{table_name} (#{column})"
+        end
 
-      def add_fulltext_index (table_name, column)
-        execute "CREATE INDEX #{table_name}_#{column}_idx on #{table_name} (#{column})"
-      end
+        def enumerations
+          @enumerations ||= Hash.new
+        end
 
-      def enumerations
-        @enumerations ||= Hash.new
-      end
+        def create_enumeration (enumeration_name, values)
+          enumerations[enumeration_name] = values
+          execute "create type #{enumeration_name} as enum ('#{values.join '\',\''}')"
+        end
 
-      def create_enumeration (enumeration_name, values)
-        enumerations[enumeration_name] = values
-        execute "create type #{enumeration_name} as enum ('#{values.join '\',\''}')"
-      end
+        def drop_enumeration (enumeration_name)
+          execute "drop type #{enumeration_name}"
+          enumerations.delete(enumeration_name)
+        end
 
-      def drop_enumeration (enumeration_name)
-        execute "drop type #{enumeration_name}"
-        enumerations.delete(enumeration_name)
-      end
+        def alter_primary_key(table_name, new_columns)
+          execute "alter table #{table_name} drop constraint #{table_name}_pkey; alter table #{table_name} add primary key (#{new_columns.join(',')})"
+        end
 
-      def alter_primary_key(table_name, new_columns)
-        execute "alter table #{table_name} drop constraint #{table_name}_pkey; alter table #{table_name} add primary key (#{new_columns.join(',')})"
-      end
+        def interval_constant(interval)
+          "'#{interval}'::interval"
+        end
 
-      def interval_constant(interval)
-        "'#{interval}'::interval"
-      end
+        def add_index(table_name, column_name, options = {})
+          column_names = Array(column_name)
+          index_name   = index_name(table_name, :column => column_names)
 
-      def add_index(table_name, column_name, options = {})
-        column_names = Array(column_name)
-        index_name   = index_name(table_name, :column => column_names)
+          if Hash === options # legacy support, since this param was a string
+            index_type = options[:unique] ? "UNIQUE" : ""
+            index_name = options[:name] || index_name
+            index_method = options[:method] || "BTREE"
+          else
+            index_type = options
+          end
 
-        if Hash === options # legacy support, since this param was a string
-          index_type = options[:unique] ? "UNIQUE" : ""
-          index_name = options[:name] || index_name
-          index_method = options[:method] || "BTREE"
-        else
-          index_type = options
-        end
+          quoted_column_names = column_names.map { |e| quote_column_name(e) }
+          if Hash === options and options[:lowercase]
+            quoted_column_names = quoted_column_names.map { |e| "LOWER(#{e})" }
+          end
+          quoted_column_names = quoted_column_names.join(", ")
 
-        quoted_column_names = column_names.map { |e| quote_column_name(e) }
-        if Hash === options and options[:lowercase]
-          quoted_column_names = quoted_column_names.map { |e| "LOWER(#{e})" }
+          execute "CREATE #{index_type} INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)} USING #{index_method} (#{quoted_column_names})"
         end
-        quoted_column_names = quoted_column_names.join(", ")
-
-        execute "CREATE #{index_type} INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)} USING #{index_method} (#{quoted_column_names})"
       end
     end
   end