Fixup make_friend and remove_friend properly

[rails.git] / lib / migrate.rb

diff --git a/lib/migrate.rb b/lib/migrate.rb
index 50ba6321dc24ffea9e7388137433f1b370e51f4c..7549add2abfb7e5623a23dbd26f8981c0e4ab6a2 100644 (file)
--- 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 " +
 
       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)
       end
 
       def remove_foreign_key(table_name, column_name, reftbl, refcol = nil)


@@ -42,77 +42,8 @@ module ActiveRecord
       end
     end
 
       end
     end
 

-    class MysqlAdapter
-      if MysqlAdapter.public_instance_methods(false).include?('native_database_types')
-        alias_method :old_native_database_types, :native_database_types
-      end
-
-      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" }
-        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"]
-
-          unless type == :string or type == :text
-            options.delete(:default) if options[:default] = "";
-          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
-
-      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_option
-        return "ENGINE=InnoDB"
-      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 alter_column_nwr_enum (table_name, column)
-        execute "alter table #{table_name} change column #{column} #{column} enum('Node','Way','Relation');"
-      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}'"
-      end
-    end
-

     class PostgreSQLAdapter
     class PostgreSQLAdapter

-      if PostgreSQLAdapter.public_instance_methods(false).include?('native_database_types')
-        alias_method :old_native_database_types, :native_database_types
-      end
+      alias_method :old_native_database_types, :native_database_types

 
       def native_database_types
         types = old_native_database_types
 
       def native_database_types
         types = old_native_database_types


@@ -125,6 +56,11 @@ module ActiveRecord
         types[:bigint_auto_20] = { :name => "bigint" } #fixme: need autoincrement?
         types[:four_byte_unsigned] = { :name => "bigint" } # meh
         types[:inet] = { :name=> "inet" }
         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
+

         types
       end
 
         types
       end
 


@@ -139,7 +75,7 @@ module ActiveRecord
       def innodb_option
         return ""
       end
       def innodb_option
         return ""
       end

- 
+

       def change_engine (table_name, engine)
       end
 
       def change_engine (table_name, engine)
       end
 


@@ -147,13 +83,18 @@ module ActiveRecord
         execute "CREATE INDEX #{table_name}_#{column}_idx on #{table_name} (#{column})"
       end
 
         execute "CREATE INDEX #{table_name}_#{column}_idx on #{table_name} (#{column})"
       end
 

-      def alter_column_nwr_enum (table_name, column)
-        response = select_one("select count(*) as count from pg_type where typname = 'nwr_enum'")
-        if response['count'] == "0" #yep, as a string
-          execute "create type nwr_enum as ENUM ('Node', 'Way', 'Relation')"
-        end
-        execute        "alter table #{table_name} drop #{column}"
-        execute "alter table #{table_name} add #{column} nwr_enum"
+      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 drop_enumeration (enumeration_name)
+        execute "drop type #{enumeration_name}"
+        enumerations.delete(enumeration_name)

       end
 
       def alter_primary_key(table_name, new_columns)
       end
 
       def alter_primary_key(table_name, new_columns)


@@ -175,7 +116,13 @@ module ActiveRecord
         else
           index_type = options
         end
         else
           index_type = options
         end

-        quoted_column_names = column_names.map { |e| quote_column_name(e) }.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})" }
+        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
         execute "CREATE #{index_type} INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)} USING #{index_method} (#{quoted_column_names})"
       end
     end