Handle differences in interval constant formatting.

[rails.git] / lib / migrate.rb

diff --git a/lib/migrate.rb b/lib/migrate.rb
index d43982e8c9f45dc21e2573bb98403d4e49ec6824..392060b6015a8cdb34d5fcfa6172e8a215b05eb4 100644 (file)
--- a/lib/migrate.rb
+++ b/lib/migrate.rb
@@ -92,12 +92,16 @@ 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
@@ -141,7 +145,7 @@ module ActiveRecord
       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')"
+          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"
@@ -150,6 +154,10 @@ module ActiveRecord
       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
 end