Merge api06 branch to trunk.

[rails.git] / lib / migrate.rb

diff --git a/lib/migrate.rb b/lib/migrate.rb
index 69538f1da6f86e36628f371e80b5cd55feb65ea3..392060b6015a8cdb34d5fcfa6172e8a215b05eb4 100644 (file)
--- a/lib/migrate.rb
+++ b/lib/migrate.rb
@@ -38,17 +38,22 @@ module ActiveRecord
     end
 
     class MysqlAdapter
-      alias_method :old_native_database_types, :native_database_types
+      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
 
@@ -77,7 +82,7 @@ module ActiveRecord
       def innodb_option
         return "ENGINE=InnoDB"
       end
- 
+
       def change_engine (table_name, engine)
         execute "ALTER TABLE #{table_name} ENGINE = #{engine}"
       end
@@ -87,7 +92,71 @@ module ActiveRecord
       end
 
       def alter_column_nwr_enum (table_name, column)
-        execute "alter table #{table_name} change column #{column} #{column} enum('node','way','relation');"
+        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
+      if PostgreSQLAdapter.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[: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
+
+      def myisam_table
+        return { :id => false, :force => true, :options => ""}
+      end
+
+      def innodb_table
+        return { :id => false, :force => true, :options => ""}
+      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 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"
+      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
     end
   end