X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/08bd1688ee10b0eb9b474c235f92e6ea17365fa0..16592c59f9467425478f2a0334d11ae4e9c9f168:/lib/migrate.rb diff --git a/lib/migrate.rb b/lib/migrate.rb index 488c6d3d2..81cdd4d05 100644 --- a/lib/migrate.rb +++ b/lib/migrate.rb @@ -21,6 +21,11 @@ module ActiveRecord "REFERENCES #{reftbl} (#{quote_column_names(refcol || column_name)})" end + def remove_foreign_key(table_name, column_name, reftbl, refcol = nil) + execute "ALTER TABLE #{table_name} DROP " + + "CONSTRAINT #{table_name}_#{column_name[0]}_fkey" + end + alias_method :old_options_include_default?, :options_include_default? def options_include_default?(options) @@ -54,6 +59,11 @@ module ActiveRecord 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 + types end @@ -91,13 +101,25 @@ module ActiveRecord 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');" + def enumerations + @enumerations ||= Hash.new + end + + def create_enumeration (enumeration_name, values) + enumerations[enumeration_name] = values + 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 interval_constant(interval) + "'#{interval}'" + end end class PostgreSQLAdapter @@ -116,6 +138,11 @@ module ActiveRecord 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 @@ -138,18 +165,42 @@ module ActiveRecord 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) 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 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 + quoted_column_names = column_names.map { |e| quote_column_name(e) }.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 end