X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8fa9763281c5bcd4e9a88cfa0597e4e9a86963e7..4e64291839d45a0c660fc84f11a6c4c811cf8f21:/db/structure.sql diff --git a/db/structure.sql b/db/structure.sql index e54354a03..c7e26ac66 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -1107,7 +1107,7 @@ CREATE TABLE users ( 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, + auth_uid character varying, preferred_editor character varying, terms_seen boolean DEFAULT false NOT NULL, description_format format_enum DEFAULT 'markdown'::format_enum NOT NULL, @@ -1116,7 +1116,8 @@ CREATE TABLE users ( 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, + auth_provider character varying ); @@ -1970,13 +1971,6 @@ CREATE UNIQUE INDEX unique_schema_migrations ON schema_migrations USING btree (v CREATE INDEX user_id_idx ON friends USING btree (friend_user_id); --- --- Name: user_openid_url_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: --- - -CREATE UNIQUE INDEX user_openid_url_idx ON users USING btree (openid_url); - - -- -- Name: user_roles_id_role_unique; Type: INDEX; Schema: public; Owner: -; Tablespace: -- @@ -1998,6 +1992,13 @@ CREATE UNIQUE INDEX user_tokens_token_idx ON user_tokens USING btree (token); CREATE INDEX user_tokens_user_id_idx ON user_tokens USING btree (user_id); +-- +-- Name: users_auth_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- + +CREATE UNIQUE INDEX users_auth_idx ON users USING btree (auth_provider, auth_uid); + + -- -- Name: users_display_name_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: -- @@ -2543,6 +2544,10 @@ INSERT INTO schema_migrations (version) VALUES ('20140519141742'); INSERT INTO schema_migrations (version) VALUES ('20150110152606'); +INSERT INTO schema_migrations (version) VALUES ('20150111192335'); + +INSERT INTO schema_migrations (version) VALUES ('20150222101847'); + INSERT INTO schema_migrations (version) VALUES ('21'); INSERT INTO schema_migrations (version) VALUES ('22');