From: Tom Hughes <tom@compton.nu>
Date: Sat, 17 Jan 2015 11:09:13 +0000 (+0000)
Subject: Merge branch 'rails42'
X-Git-Tag: live~4281
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/cd2ca12d4235473cd3611b84e2a61649c17da2f6?hp=-c

Merge branch 'rails42'
---

cd2ca12d4235473cd3611b84e2a61649c17da2f6
diff --combined db/structure.sql
index 9bb9fa5a9,e54354a03..6f668f21e
--- a/db/structure.sql
+++ b/db/structure.sql
@@@ -158,9 -158,9 +158,9 @@@ SET default_with_oids = false
  CREATE TABLE acls (
      id integer NOT NULL,
      address inet,
 -    k character varying NOT NULL,
 -    v character varying,
 -    domain character varying
 +    k character varying(255) NOT NULL,
 +    v character varying(255),
 +    domain character varying(255)
  );
  
  
@@@ -222,8 -222,8 +222,8 @@@ ALTER SEQUENCE changeset_comments_id_se
  
  CREATE TABLE changeset_tags (
      changeset_id bigint NOT NULL,
 -    k character varying DEFAULT ''::character varying NOT NULL,
 -    v character varying DEFAULT ''::character varying NOT NULL
 +    k character varying(255) DEFAULT ''::character varying NOT NULL,
 +    v character varying(255) DEFAULT ''::character varying NOT NULL
  );
  
  
@@@ -279,10 -279,10 +279,10 @@@ CREATE TABLE changesets_subscribers 
  
  CREATE TABLE client_applications (
      id integer NOT NULL,
 -    name character varying,
 -    url character varying,
 -    support_url character varying,
 -    callback_url character varying,
 +    name character varying(255),
 +    url character varying(255),
 +    support_url character varying(255),
 +    callback_url character varying(255),
      key character varying(50),
      secret character varying(50),
      user_id integer,
@@@ -323,8 -323,8 +323,8 @@@ ALTER SEQUENCE client_applications_id_s
  
  CREATE TABLE current_node_tags (
      node_id bigint NOT NULL,
 -    k character varying DEFAULT ''::character varying NOT NULL,
 -    v character varying DEFAULT ''::character varying NOT NULL
 +    k character varying(255) DEFAULT ''::character varying NOT NULL,
 +    v character varying(255) DEFAULT ''::character varying NOT NULL
  );
  
  
@@@ -371,7 -371,7 +371,7 @@@ CREATE TABLE current_relation_members 
      relation_id bigint NOT NULL,
      member_type nwr_enum NOT NULL,
      member_id bigint NOT NULL,
 -    member_role character varying NOT NULL,
 +    member_role character varying(255) NOT NULL,
      sequence_id integer DEFAULT 0 NOT NULL
  );
  
@@@ -382,8 -382,8 +382,8 @@@
  
  CREATE TABLE current_relation_tags (
      relation_id bigint NOT NULL,
 -    k character varying DEFAULT ''::character varying NOT NULL,
 -    v character varying DEFAULT ''::character varying NOT NULL
 +    k character varying(255) DEFAULT ''::character varying NOT NULL,
 +    v character varying(255) DEFAULT ''::character varying NOT NULL
  );
  
  
@@@ -436,8 -436,8 +436,8 @@@ CREATE TABLE current_way_nodes 
  
  CREATE TABLE current_way_tags (
      way_id bigint NOT NULL,
 -    k character varying DEFAULT ''::character varying NOT NULL,
 -    v character varying DEFAULT ''::character varying NOT NULL
 +    k character varying(255) DEFAULT ''::character varying NOT NULL,
 +    v character varying(255) DEFAULT ''::character varying NOT NULL
  );
  
  
@@@ -515,13 -515,13 +515,13 @@@ ALTER SEQUENCE diary_comments_id_seq OW
  CREATE TABLE diary_entries (
      id bigint NOT NULL,
      user_id bigint NOT NULL,
 -    title character varying NOT NULL,
 +    title character varying(255) NOT NULL,
      body text NOT NULL,
      created_at timestamp without time zone NOT NULL,
      updated_at timestamp without time zone NOT NULL,
      latitude double precision,
      longitude double precision,
 -    language_code character varying DEFAULT 'en'::character varying NOT NULL,
 +    language_code character varying(255) DEFAULT 'en'::character varying NOT NULL,
      visible boolean DEFAULT true NOT NULL,
      body_format format_enum DEFAULT 'markdown'::format_enum NOT NULL
  );
@@@ -597,7 -597,7 +597,7 @@@ CREATE TABLE gps_points 
  
  CREATE TABLE gpx_file_tags (
      gpx_id bigint DEFAULT 0 NOT NULL,
 -    tag character varying NOT NULL,
 +    tag character varying(255) NOT NULL,
      id bigint NOT NULL
  );
  
@@@ -629,12 -629,12 +629,12 @@@ CREATE TABLE gpx_files 
      id bigint NOT NULL,
      user_id bigint NOT NULL,
      visible boolean DEFAULT true NOT NULL,
 -    name character varying DEFAULT ''::character varying NOT NULL,
 +    name character varying(255) DEFAULT ''::character varying NOT NULL,
      size bigint,
      latitude double precision,
      longitude double precision,
      "timestamp" timestamp without time zone NOT NULL,
 -    description character varying DEFAULT ''::character varying NOT NULL,
 +    description character varying(255) DEFAULT ''::character varying NOT NULL,
      inserted boolean NOT NULL,
      visibility gpx_visibility_enum DEFAULT 'public'::gpx_visibility_enum NOT NULL
  );
@@@ -664,9 -664,9 +664,9 @@@ ALTER SEQUENCE gpx_files_id_seq OWNED B
  --
  
  CREATE TABLE languages (
 -    code character varying NOT NULL,
 -    english_name character varying NOT NULL,
 -    native_name character varying
 +    code character varying(255) NOT NULL,
 +    english_name character varying(255) NOT NULL,
 +    native_name character varying(255)
  );
  
  
@@@ -677,7 -677,7 +677,7 @@@
  CREATE TABLE messages (
      id bigint NOT NULL,
      from_user_id bigint NOT NULL,
 -    title character varying NOT NULL,
 +    title character varying(255) NOT NULL,
      body text NOT NULL,
      sent_on timestamp without time zone NOT NULL,
      message_read boolean DEFAULT false NOT NULL,
@@@ -714,8 -714,8 +714,8 @@@ ALTER SEQUENCE messages_id_seq OWNED B
  CREATE TABLE node_tags (
      node_id bigint NOT NULL,
      version bigint NOT NULL,
 -    k character varying DEFAULT ''::character varying NOT NULL,
 -    v character varying DEFAULT ''::character varying NOT NULL
 +    k character varying(255) DEFAULT ''::character varying NOT NULL,
 +    v character varying(255) DEFAULT ''::character varying NOT NULL
  );
  
  
@@@ -741,7 -741,7 +741,7 @@@ CREATE TABLE nodes 
  --
  
  CREATE TABLE note_comments (
 -    id bigint NOT NULL,
 +    id integer NOT NULL,
      note_id bigint NOT NULL,
      visible boolean NOT NULL,
      created_at timestamp without time zone NOT NULL,
@@@ -776,7 -776,7 +776,7 @@@ ALTER SEQUENCE note_comments_id_seq OWN
  --
  
  CREATE TABLE notes (
 -    id bigint NOT NULL,
 +    id integer NOT NULL,
      latitude integer NOT NULL,
      longitude integer NOT NULL,
      tile bigint NOT NULL,
@@@ -812,7 -812,7 +812,7 @@@ ALTER SEQUENCE notes_id_seq OWNED BY no
  
  CREATE TABLE oauth_nonces (
      id integer NOT NULL,
 -    nonce character varying,
 +    nonce character varying(255),
      "timestamp" integer,
      created_at timestamp without time zone,
      updated_at timestamp without time zone
@@@ -859,9 -859,9 +859,9 @@@ CREATE TABLE oauth_tokens 
      allow_write_api boolean DEFAULT false NOT NULL,
      allow_read_gpx boolean DEFAULT false NOT NULL,
      allow_write_gpx boolean DEFAULT false NOT NULL,
 -    callback_url character varying,
 +    callback_url character varying(255),
      verifier character varying(20),
 -    scope character varying,
 +    scope character varying(255),
      valid_to timestamp without time zone,
      allow_write_notes boolean DEFAULT false NOT NULL
  );
@@@ -892,10 -892,10 +892,10 @@@ ALTER SEQUENCE oauth_tokens_id_seq OWNE
  
  CREATE TABLE redactions (
      id integer NOT NULL,
 -    title character varying,
 +    title character varying(255),
      description text,
 -    created_at timestamp without time zone,
 -    updated_at timestamp without time zone,
 +    created_at timestamp without time zone NOT NULL,
 +    updated_at timestamp without time zone NOT NULL,
      user_id bigint NOT NULL,
      description_format format_enum DEFAULT 'markdown'::format_enum NOT NULL
  );
@@@ -928,7 -928,7 +928,7 @@@ CREATE TABLE relation_members 
      relation_id bigint DEFAULT 0 NOT NULL,
      member_type nwr_enum NOT NULL,
      member_id bigint NOT NULL,
 -    member_role character varying NOT NULL,
 +    member_role character varying(255) NOT NULL,
      version bigint DEFAULT 0 NOT NULL,
      sequence_id integer DEFAULT 0 NOT NULL
  );
@@@ -940,8 -940,8 +940,8 @@@
  
  CREATE TABLE relation_tags (
      relation_id bigint DEFAULT 0 NOT NULL,
 -    k character varying DEFAULT ''::character varying NOT NULL,
 -    v character varying DEFAULT ''::character varying NOT NULL,
 +    k character varying(255) DEFAULT ''::character varying NOT NULL,
 +    v character varying(255) DEFAULT ''::character varying NOT NULL,
      version bigint NOT NULL
  );
  
@@@ -965,7 -965,7 +965,7 @@@ CREATE TABLE relations 
  --
  
  CREATE TABLE schema_migrations (
 -    version character varying NOT NULL
 +    version character varying(255) NOT NULL
  );
  
  
@@@ -1012,8 -1012,8 +1012,8 @@@ ALTER SEQUENCE user_blocks_id_seq OWNE
  
  CREATE TABLE user_preferences (
      user_id bigint NOT NULL,
 -    k character varying NOT NULL,
 -    v character varying NOT NULL
 +    k character varying(255) NOT NULL,
 +    v character varying(255) NOT NULL
  );
  
  
@@@ -1024,9 -1024,9 +1024,9 @@@
  CREATE TABLE user_roles (
      id integer NOT NULL,
      user_id bigint NOT NULL,
 -    role user_role_enum NOT NULL,
      created_at timestamp without time zone,
      updated_at timestamp without time zone,
 +    role user_role_enum NOT NULL,
      granter_id bigint NOT NULL
  );
  
@@@ -1057,7 -1057,7 +1057,7 @@@ ALTER SEQUENCE user_roles_id_seq OWNED 
  CREATE TABLE user_tokens (
      id bigint NOT NULL,
      user_id bigint NOT NULL,
 -    token character varying NOT NULL,
 +    token character varying(255) NOT NULL,
      expiry timestamp without time zone NOT NULL,
      referer text
  );
@@@ -1087,36 -1087,36 +1087,36 @@@ ALTER SEQUENCE user_tokens_id_seq OWNE
  --
  
  CREATE TABLE users (
 -    email character varying NOT NULL,
 +    email character varying(255) NOT NULL,
      id bigint NOT NULL,
 -    pass_crypt character varying NOT NULL,
 +    pass_crypt character varying(255) NOT NULL,
      creation_time timestamp without time zone NOT NULL,
 -    display_name character varying DEFAULT ''::character varying NOT NULL,
 +    display_name character varying(255) DEFAULT ''::character varying NOT NULL,
      data_public boolean DEFAULT false NOT NULL,
      description text DEFAULT ''::text NOT NULL,
      home_lat double precision,
      home_lon double precision,
      home_zoom smallint DEFAULT 3,
      nearby integer DEFAULT 50,
 -    pass_salt character varying,
 +    pass_salt character varying(255),
      image_file_name text,
      email_valid boolean DEFAULT false NOT NULL,
 -    new_email character varying,
 -    creation_ip character varying,
 -    languages character varying,
 +    new_email character varying(255),
 +    creation_ip character varying(255),
 +    languages character varying(255),
      status user_status_enum DEFAULT 'pending'::user_status_enum NOT NULL,
      terms_agreed timestamp without time zone,
      consider_pd boolean DEFAULT false NOT NULL,
 -    openid_url character varying,
 -    preferred_editor character varying,
 +    preferred_editor character varying(255),
      terms_seen boolean DEFAULT false NOT NULL,
 +    openid_url character varying(255),
      description_format format_enum DEFAULT 'markdown'::format_enum NOT NULL,
 -    image_fingerprint character varying,
 +    image_fingerprint character varying(255),
      changesets_count integer DEFAULT 0 NOT NULL,
      traces_count integer DEFAULT 0 NOT NULL,
      diary_entries_count integer DEFAULT 0 NOT NULL,
      image_use_gravatar boolean DEFAULT true NOT NULL,
 -    image_content_type character varying
 +    image_content_type character varying(255)
  );
  
  
@@@ -1157,8 -1157,8 +1157,8 @@@ CREATE TABLE way_nodes 
  
  CREATE TABLE way_tags (
      way_id bigint DEFAULT 0 NOT NULL,
 -    k character varying NOT NULL,
 -    v character varying NOT NULL,
 +    k character varying(255) NOT NULL,
 +    v character varying(255) NOT NULL,
      version bigint NOT NULL
  );
  
@@@ -1795,13 -1795,6 +1795,6 @@@ CREATE INDEX gpx_files_user_id_idx ON g
  CREATE INDEX gpx_files_visible_visibility_idx ON gpx_files USING btree (visible, visibility);
  
  
- --
- -- Name: index_changeset_comments_on_body; Type: INDEX; Schema: public; Owner: -; Tablespace: 
- --
- 
- CREATE INDEX index_changeset_comments_on_body ON changeset_comments USING btree (body);
- 
- 
  --
  -- Name: index_changeset_comments_on_created_at; Type: INDEX; Schema: public; Owner: -; Tablespace: 
  --
@@@ -2550,8 -2543,6 +2543,8 @@@ INSERT INTO schema_migrations (version
  
  INSERT INTO schema_migrations (version) VALUES ('20150110152606');
  
 +INSERT INTO schema_migrations (version) VALUES ('20150111192335');
 +
  INSERT INTO schema_migrations (version) VALUES ('21');
  
  INSERT INTO schema_migrations (version) VALUES ('22');