X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d717f2d02a9f767237d103dc206e30e3a4a8c056..8100be1e8db3017fe42c7785c391d73e0aff7992:/lib/migrate.rb?ds=sidebyside diff --git a/lib/migrate.rb b/lib/migrate.rb index 3b1e46fb8..05b3c90f2 100644 --- a/lib/migrate.rb +++ b/lib/migrate.rb @@ -46,12 +46,14 @@ module ActiveRecord 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 NOT NULL" } + types[:four_byte_unsigned] = { :name=> "integer unsigned" } + types[:inet] = { :name=> "integer unsigned" } types end @@ -90,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 @@ -106,12 +112,14 @@ module ActiveRecord 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 @@ -137,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" @@ -146,6 +154,25 @@ 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 + + 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