X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/821a22c6073d4b50ae7038e9c1aacbb5e68cd55a..3a14abde1beae0438d043f536b8417ea92dc2eb7:/db/structure.sql diff --git a/db/structure.sql b/db/structure.sql index 9bb9fa5a9..5e9b74195 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -2,12 +2,16 @@ -- PostgreSQL database dump -- +-- Dumped from database version 9.5.3 +-- Dumped by pg_dump version 9.5.3 + SET statement_timeout = 0; SET lock_timeout = 0; SET client_encoding = 'UTF8'; SET standard_conforming_strings = on; SET check_function_bodies = false; SET client_min_messages = warning; +SET row_security = off; -- -- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: - @@ -126,7 +130,7 @@ CREATE TYPE user_status_enum AS ENUM ( CREATE FUNCTION maptile_for_point(bigint, bigint, integer) RETURNS integer LANGUAGE c STRICT - AS '/srv/www/master.osm.compton.nu/db/functions/libpgosm.so', 'maptile_for_point'; + AS '$libdir/libpgosm', 'maptile_for_point'; -- @@ -135,7 +139,7 @@ CREATE FUNCTION maptile_for_point(bigint, bigint, integer) RETURNS integer CREATE FUNCTION tile_for_point(integer, integer) RETURNS bigint LANGUAGE c STRICT - AS '/srv/www/master.osm.compton.nu/db/functions/libpgosm.so', 'tile_for_point'; + AS '$libdir/libpgosm', 'tile_for_point'; -- @@ -144,7 +148,7 @@ CREATE FUNCTION tile_for_point(integer, integer) RETURNS bigint CREATE FUNCTION xid_to_int4(xid) RETURNS integer LANGUAGE c IMMUTABLE STRICT - AS '/srv/www/master.osm.compton.nu/db/functions/libpgosm.so', 'xid_to_int4'; + AS '$libdir/libpgosm', 'xid_to_int4'; SET default_tablespace = ''; @@ -152,7 +156,7 @@ SET default_tablespace = ''; SET default_with_oids = false; -- --- Name: acls; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: acls; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE acls ( @@ -184,7 +188,7 @@ ALTER SEQUENCE acls_id_seq OWNED BY acls.id; -- --- Name: changeset_comments; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: changeset_comments; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE changeset_comments ( @@ -217,7 +221,7 @@ ALTER SEQUENCE changeset_comments_id_seq OWNED BY changeset_comments.id; -- --- Name: changeset_tags; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: changeset_tags; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE changeset_tags ( @@ -228,7 +232,7 @@ CREATE TABLE changeset_tags ( -- --- Name: changesets; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: changesets; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE changesets ( @@ -264,7 +268,7 @@ ALTER SEQUENCE changesets_id_seq OWNED BY changesets.id; -- --- Name: changesets_subscribers; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: changesets_subscribers; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE changesets_subscribers ( @@ -274,7 +278,7 @@ CREATE TABLE changesets_subscribers ( -- --- Name: client_applications; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: client_applications; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE client_applications ( @@ -318,7 +322,7 @@ ALTER SEQUENCE client_applications_id_seq OWNED BY client_applications.id; -- --- Name: current_node_tags; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: current_node_tags; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE current_node_tags ( @@ -329,7 +333,7 @@ CREATE TABLE current_node_tags ( -- --- Name: current_nodes; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: current_nodes; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE current_nodes ( @@ -364,7 +368,7 @@ ALTER SEQUENCE current_nodes_id_seq OWNED BY current_nodes.id; -- --- Name: current_relation_members; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: current_relation_members; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE current_relation_members ( @@ -377,7 +381,7 @@ CREATE TABLE current_relation_members ( -- --- Name: current_relation_tags; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: current_relation_tags; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE current_relation_tags ( @@ -388,7 +392,7 @@ CREATE TABLE current_relation_tags ( -- --- Name: current_relations; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: current_relations; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE current_relations ( @@ -420,7 +424,7 @@ ALTER SEQUENCE current_relations_id_seq OWNED BY current_relations.id; -- --- Name: current_way_nodes; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: current_way_nodes; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE current_way_nodes ( @@ -431,7 +435,7 @@ CREATE TABLE current_way_nodes ( -- --- Name: current_way_tags; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: current_way_tags; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE current_way_tags ( @@ -442,7 +446,7 @@ CREATE TABLE current_way_tags ( -- --- Name: current_ways; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: current_ways; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE current_ways ( @@ -474,7 +478,7 @@ ALTER SEQUENCE current_ways_id_seq OWNED BY current_ways.id; -- --- Name: diary_comments; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: diary_comments; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE diary_comments ( @@ -509,7 +513,7 @@ ALTER SEQUENCE diary_comments_id_seq OWNED BY diary_comments.id; -- --- Name: diary_entries; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: diary_entries; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE diary_entries ( @@ -545,9 +549,17 @@ CREATE SEQUENCE diary_entries_id_seq ALTER SEQUENCE diary_entries_id_seq OWNED BY diary_entries.id; +-- Name: diary_entry_subscriptions; Type: TABLE; Schema: public; Owner: - +-- + +CREATE TABLE diary_entry_subscriptions ( + user_id bigint NOT NULL, + diary_entry_id bigint NOT NULL +); + -- --- Name: friends; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: friends; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE friends ( @@ -577,7 +589,7 @@ ALTER SEQUENCE friends_id_seq OWNED BY friends.id; -- --- Name: gps_points; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: gps_points; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE gps_points ( @@ -592,7 +604,7 @@ CREATE TABLE gps_points ( -- --- Name: gpx_file_tags; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: gpx_file_tags; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE gpx_file_tags ( @@ -622,7 +634,7 @@ ALTER SEQUENCE gpx_file_tags_id_seq OWNED BY gpx_file_tags.id; -- --- Name: gpx_files; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: gpx_files; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE gpx_files ( @@ -660,7 +672,7 @@ ALTER SEQUENCE gpx_files_id_seq OWNED BY gpx_files.id; -- --- Name: languages; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: languages; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE languages ( @@ -671,7 +683,7 @@ CREATE TABLE languages ( -- --- Name: messages; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: messages; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE messages ( @@ -708,7 +720,7 @@ ALTER SEQUENCE messages_id_seq OWNED BY messages.id; -- --- Name: node_tags; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: node_tags; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE node_tags ( @@ -720,7 +732,7 @@ CREATE TABLE node_tags ( -- --- Name: nodes; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: nodes; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE nodes ( @@ -737,7 +749,7 @@ CREATE TABLE nodes ( -- --- Name: note_comments; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: note_comments; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE note_comments ( @@ -772,7 +784,7 @@ ALTER SEQUENCE note_comments_id_seq OWNED BY note_comments.id; -- --- Name: notes; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: notes; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE notes ( @@ -807,7 +819,7 @@ ALTER SEQUENCE notes_id_seq OWNED BY notes.id; -- --- Name: oauth_nonces; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: oauth_nonces; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE oauth_nonces ( @@ -839,7 +851,7 @@ ALTER SEQUENCE oauth_nonces_id_seq OWNED BY oauth_nonces.id; -- --- Name: oauth_tokens; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: oauth_tokens; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE oauth_tokens ( @@ -887,7 +899,7 @@ ALTER SEQUENCE oauth_tokens_id_seq OWNED BY oauth_tokens.id; -- --- Name: redactions; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: redactions; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE redactions ( @@ -921,7 +933,7 @@ ALTER SEQUENCE redactions_id_seq OWNED BY redactions.id; -- --- Name: relation_members; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: relation_members; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE relation_members ( @@ -935,7 +947,7 @@ CREATE TABLE relation_members ( -- --- Name: relation_tags; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: relation_tags; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE relation_tags ( @@ -947,7 +959,7 @@ CREATE TABLE relation_tags ( -- --- Name: relations; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: relations; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE relations ( @@ -961,7 +973,7 @@ CREATE TABLE relations ( -- --- Name: schema_migrations; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: schema_migrations; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE schema_migrations ( @@ -970,7 +982,7 @@ CREATE TABLE schema_migrations ( -- --- Name: user_blocks; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: user_blocks; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE user_blocks ( @@ -1007,7 +1019,7 @@ ALTER SEQUENCE user_blocks_id_seq OWNED BY user_blocks.id; -- --- Name: user_preferences; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: user_preferences; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE user_preferences ( @@ -1018,7 +1030,7 @@ CREATE TABLE user_preferences ( -- --- Name: user_roles; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: user_roles; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE user_roles ( @@ -1051,7 +1063,7 @@ ALTER SEQUENCE user_roles_id_seq OWNED BY user_roles.id; -- --- Name: user_tokens; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: user_tokens; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE user_tokens ( @@ -1083,7 +1095,7 @@ ALTER SEQUENCE user_tokens_id_seq OWNED BY user_tokens.id; -- --- Name: users; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: users; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE users ( @@ -1109,14 +1121,15 @@ CREATE TABLE users ( consider_pd boolean DEFAULT false NOT NULL, preferred_editor character varying(255), terms_seen boolean DEFAULT false NOT NULL, - openid_url character varying(255), + auth_uid character varying(255), description_format format_enum DEFAULT 'markdown'::format_enum NOT NULL, 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(255) + image_use_gravatar boolean DEFAULT false NOT NULL, + image_content_type character varying(255), + auth_provider character varying ); @@ -1140,7 +1153,7 @@ ALTER SEQUENCE users_id_seq OWNED BY users.id; -- --- Name: way_nodes; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: way_nodes; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE way_nodes ( @@ -1152,7 +1165,7 @@ CREATE TABLE way_nodes ( -- --- Name: way_tags; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: way_tags; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE way_tags ( @@ -1164,7 +1177,7 @@ CREATE TABLE way_tags ( -- --- Name: ways; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- Name: ways; Type: TABLE; Schema: public; Owner: - -- CREATE TABLE ways ( @@ -1332,7 +1345,7 @@ ALTER TABLE ONLY users ALTER COLUMN id SET DEFAULT nextval('users_id_seq'::regcl -- --- Name: acls_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: acls_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY acls @@ -1340,7 +1353,7 @@ ALTER TABLE ONLY acls -- --- Name: changeset_comments_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: changeset_comments_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY changeset_comments @@ -1348,7 +1361,7 @@ ALTER TABLE ONLY changeset_comments -- --- Name: changesets_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: changesets_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY changesets @@ -1356,7 +1369,7 @@ ALTER TABLE ONLY changesets -- --- Name: client_applications_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: client_applications_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY client_applications @@ -1364,7 +1377,7 @@ ALTER TABLE ONLY client_applications -- --- Name: current_node_tags_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: current_node_tags_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY current_node_tags @@ -1372,7 +1385,7 @@ ALTER TABLE ONLY current_node_tags -- --- Name: current_nodes_pkey1; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: current_nodes_pkey1; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY current_nodes @@ -1380,7 +1393,7 @@ ALTER TABLE ONLY current_nodes -- --- Name: current_relation_members_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: current_relation_members_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY current_relation_members @@ -1388,7 +1401,7 @@ ALTER TABLE ONLY current_relation_members -- --- Name: current_relation_tags_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: current_relation_tags_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY current_relation_tags @@ -1396,7 +1409,7 @@ ALTER TABLE ONLY current_relation_tags -- --- Name: current_relations_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: current_relations_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY current_relations @@ -1404,7 +1417,7 @@ ALTER TABLE ONLY current_relations -- --- Name: current_way_nodes_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: current_way_nodes_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY current_way_nodes @@ -1412,7 +1425,7 @@ ALTER TABLE ONLY current_way_nodes -- --- Name: current_way_tags_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: current_way_tags_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY current_way_tags @@ -1420,7 +1433,7 @@ ALTER TABLE ONLY current_way_tags -- --- Name: current_ways_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: current_ways_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY current_ways @@ -1428,7 +1441,7 @@ ALTER TABLE ONLY current_ways -- --- Name: diary_comments_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: diary_comments_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY diary_comments @@ -1436,7 +1449,7 @@ ALTER TABLE ONLY diary_comments -- --- Name: diary_entries_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: diary_entries_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY diary_entries @@ -1444,7 +1457,15 @@ ALTER TABLE ONLY diary_entries -- --- Name: friends_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: diary_entry_subscriptions_pkey; Type: CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY diary_entry_subscriptions + ADD CONSTRAINT diary_entry_subscriptions_pkey PRIMARY KEY (user_id, diary_entry_id); + + +-- +-- Name: friends_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY friends @@ -1452,7 +1473,7 @@ ALTER TABLE ONLY friends -- --- Name: gpx_file_tags_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: gpx_file_tags_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY gpx_file_tags @@ -1460,7 +1481,7 @@ ALTER TABLE ONLY gpx_file_tags -- --- Name: gpx_files_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: gpx_files_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY gpx_files @@ -1468,7 +1489,7 @@ ALTER TABLE ONLY gpx_files -- --- Name: languages_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: languages_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY languages @@ -1476,7 +1497,7 @@ ALTER TABLE ONLY languages -- --- Name: messages_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: messages_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY messages @@ -1484,7 +1505,7 @@ ALTER TABLE ONLY messages -- --- Name: node_tags_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: node_tags_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY node_tags @@ -1492,7 +1513,7 @@ ALTER TABLE ONLY node_tags -- --- Name: nodes_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: nodes_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY nodes @@ -1500,7 +1521,7 @@ ALTER TABLE ONLY nodes -- --- Name: note_comments_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: note_comments_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY note_comments @@ -1508,7 +1529,7 @@ ALTER TABLE ONLY note_comments -- --- Name: notes_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: notes_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY notes @@ -1516,7 +1537,7 @@ ALTER TABLE ONLY notes -- --- Name: oauth_nonces_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: oauth_nonces_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY oauth_nonces @@ -1524,7 +1545,7 @@ ALTER TABLE ONLY oauth_nonces -- --- Name: oauth_tokens_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: oauth_tokens_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY oauth_tokens @@ -1532,7 +1553,7 @@ ALTER TABLE ONLY oauth_tokens -- --- Name: redactions_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: redactions_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY redactions @@ -1540,7 +1561,7 @@ ALTER TABLE ONLY redactions -- --- Name: relation_members_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: relation_members_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY relation_members @@ -1548,7 +1569,7 @@ ALTER TABLE ONLY relation_members -- --- Name: relation_tags_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: relation_tags_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY relation_tags @@ -1556,7 +1577,7 @@ ALTER TABLE ONLY relation_tags -- --- Name: relations_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: relations_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY relations @@ -1564,7 +1585,7 @@ ALTER TABLE ONLY relations -- --- Name: user_blocks_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: user_blocks_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY user_blocks @@ -1572,7 +1593,7 @@ ALTER TABLE ONLY user_blocks -- --- Name: user_preferences_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: user_preferences_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY user_preferences @@ -1580,7 +1601,7 @@ ALTER TABLE ONLY user_preferences -- --- Name: user_roles_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: user_roles_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY user_roles @@ -1588,7 +1609,7 @@ ALTER TABLE ONLY user_roles -- --- Name: user_tokens_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: user_tokens_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY user_tokens @@ -1596,7 +1617,7 @@ ALTER TABLE ONLY user_tokens -- --- Name: users_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: users_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY users @@ -1604,7 +1625,7 @@ ALTER TABLE ONLY users -- --- Name: way_nodes_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: way_nodes_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY way_nodes @@ -1612,7 +1633,7 @@ ALTER TABLE ONLY way_nodes -- --- Name: way_tags_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: way_tags_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY way_tags @@ -1620,7 +1641,7 @@ ALTER TABLE ONLY way_tags -- --- Name: ways_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: ways_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY ways @@ -1628,427 +1649,425 @@ ALTER TABLE ONLY ways -- --- Name: acls_k_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: acls_k_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX acls_k_idx ON acls USING btree (k); -- --- Name: changeset_tags_id_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: changeset_tags_id_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX changeset_tags_id_idx ON changeset_tags USING btree (changeset_id); -- --- Name: changesets_bbox_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: changesets_bbox_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX changesets_bbox_idx ON changesets USING gist (min_lat, max_lat, min_lon, max_lon); -- --- Name: changesets_closed_at_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: changesets_closed_at_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX changesets_closed_at_idx ON changesets USING btree (closed_at); -- --- Name: changesets_created_at_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: changesets_created_at_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX changesets_created_at_idx ON changesets USING btree (created_at); -- --- Name: changesets_user_id_created_at_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: changesets_user_id_created_at_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX changesets_user_id_created_at_idx ON changesets USING btree (user_id, created_at); -- --- Name: changesets_user_id_id_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: changesets_user_id_id_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX changesets_user_id_id_idx ON changesets USING btree (user_id, id); -- --- Name: current_nodes_tile_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: current_nodes_tile_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX current_nodes_tile_idx ON current_nodes USING btree (tile); -- --- Name: current_nodes_timestamp_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: current_nodes_timestamp_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX current_nodes_timestamp_idx ON current_nodes USING btree ("timestamp"); -- --- Name: current_relation_members_member_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: current_relation_members_member_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX current_relation_members_member_idx ON current_relation_members USING btree (member_type, member_id); -- --- Name: current_relations_timestamp_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: current_relations_timestamp_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX current_relations_timestamp_idx ON current_relations USING btree ("timestamp"); -- --- Name: current_way_nodes_node_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: current_way_nodes_node_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX current_way_nodes_node_idx ON current_way_nodes USING btree (node_id); -- --- Name: current_ways_timestamp_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: current_ways_timestamp_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX current_ways_timestamp_idx ON current_ways USING btree ("timestamp"); -- --- Name: diary_comment_user_id_created_at_index; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: diary_comment_user_id_created_at_index; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX diary_comment_user_id_created_at_index ON diary_comments USING btree (user_id, created_at); -- --- Name: diary_comments_entry_id_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: diary_comments_entry_id_idx; Type: INDEX; Schema: public; Owner: - -- CREATE UNIQUE INDEX diary_comments_entry_id_idx ON diary_comments USING btree (diary_entry_id, id); -- --- Name: diary_entry_created_at_index; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: diary_entry_created_at_index; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX diary_entry_created_at_index ON diary_entries USING btree (created_at); -- --- Name: diary_entry_language_code_created_at_index; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: diary_entry_language_code_created_at_index; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX diary_entry_language_code_created_at_index ON diary_entries USING btree (language_code, created_at); -- --- Name: diary_entry_user_id_created_at_index; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: diary_entry_user_id_created_at_index; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX diary_entry_user_id_created_at_index ON diary_entries USING btree (user_id, created_at); -- --- Name: friends_user_id_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: friends_user_id_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX friends_user_id_idx ON friends USING btree (user_id); -- --- Name: gpx_file_tags_gpxid_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: gpx_file_tags_gpxid_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX gpx_file_tags_gpxid_idx ON gpx_file_tags USING btree (gpx_id); -- --- Name: gpx_file_tags_tag_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: gpx_file_tags_tag_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX gpx_file_tags_tag_idx ON gpx_file_tags USING btree (tag); -- --- Name: gpx_files_timestamp_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: gpx_files_timestamp_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX gpx_files_timestamp_idx ON gpx_files USING btree ("timestamp"); -- --- Name: gpx_files_user_id_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: gpx_files_user_id_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX gpx_files_user_id_idx ON gpx_files USING btree (user_id); -- --- Name: gpx_files_visible_visibility_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: gpx_files_visible_visibility_idx; Type: INDEX; Schema: public; Owner: - -- 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: +-- Name: index_changeset_comments_on_created_at; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX index_changeset_comments_on_created_at ON changeset_comments USING btree (created_at); -- --- Name: index_changesets_subscribers_on_changeset_id; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: index_changesets_subscribers_on_changeset_id; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX index_changesets_subscribers_on_changeset_id ON changesets_subscribers USING btree (changeset_id); -- --- Name: index_changesets_subscribers_on_subscriber_id_and_changeset_id; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: index_changesets_subscribers_on_subscriber_id_and_changeset_id; Type: INDEX; Schema: public; Owner: - -- CREATE UNIQUE INDEX index_changesets_subscribers_on_subscriber_id_and_changeset_id ON changesets_subscribers USING btree (subscriber_id, changeset_id); -- --- Name: index_client_applications_on_key; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: index_client_applications_on_key; Type: INDEX; Schema: public; Owner: - -- CREATE UNIQUE INDEX index_client_applications_on_key ON client_applications USING btree (key); +-- Name: index_diary_entry_subscriptions_on_diary_entry_id; Type: INDEX; Schema: public; Owner: - -- --- Name: index_note_comments_on_body; Type: INDEX; Schema: public; Owner: -; Tablespace: + +CREATE INDEX index_diary_entry_subscriptions_on_diary_entry_id ON diary_entry_subscriptions USING btree (diary_entry_id); + +-- +-- Name: index_note_comments_on_body; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX index_note_comments_on_body ON note_comments USING gin (to_tsvector('english'::regconfig, body)); -- --- Name: index_note_comments_on_created_at; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: index_note_comments_on_created_at; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX index_note_comments_on_created_at ON note_comments USING btree (created_at); -- --- Name: index_oauth_nonces_on_nonce_and_timestamp; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: index_oauth_nonces_on_nonce_and_timestamp; Type: INDEX; Schema: public; Owner: - -- CREATE UNIQUE INDEX index_oauth_nonces_on_nonce_and_timestamp ON oauth_nonces USING btree (nonce, "timestamp"); -- --- Name: index_oauth_tokens_on_token; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: index_oauth_tokens_on_token; Type: INDEX; Schema: public; Owner: - -- CREATE UNIQUE INDEX index_oauth_tokens_on_token ON oauth_tokens USING btree (token); -- --- Name: index_user_blocks_on_user_id; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: index_user_blocks_on_user_id; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX index_user_blocks_on_user_id ON user_blocks USING btree (user_id); -- --- Name: messages_from_user_id_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: messages_from_user_id_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX messages_from_user_id_idx ON messages USING btree (from_user_id); -- --- Name: messages_to_user_id_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: messages_to_user_id_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX messages_to_user_id_idx ON messages USING btree (to_user_id); -- --- Name: nodes_changeset_id_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: nodes_changeset_id_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX nodes_changeset_id_idx ON nodes USING btree (changeset_id); -- --- Name: nodes_tile_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: nodes_tile_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX nodes_tile_idx ON nodes USING btree (tile); -- --- Name: nodes_timestamp_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: nodes_timestamp_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX nodes_timestamp_idx ON nodes USING btree ("timestamp"); -- --- Name: note_comments_note_id_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: note_comments_note_id_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX note_comments_note_id_idx ON note_comments USING btree (note_id); -- --- Name: notes_created_at_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: notes_created_at_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX notes_created_at_idx ON notes USING btree (created_at); -- --- Name: notes_tile_status_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: notes_tile_status_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX notes_tile_status_idx ON notes USING btree (tile, status); -- --- Name: notes_updated_at_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: notes_updated_at_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX notes_updated_at_idx ON notes USING btree (updated_at); -- --- Name: points_gpxid_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: points_gpxid_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX points_gpxid_idx ON gps_points USING btree (gpx_id); -- --- Name: points_tile_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: points_tile_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX points_tile_idx ON gps_points USING btree (tile); -- --- Name: relation_members_member_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: relation_members_member_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX relation_members_member_idx ON relation_members USING btree (member_type, member_id); -- --- Name: relations_changeset_id_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: relations_changeset_id_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX relations_changeset_id_idx ON relations USING btree (changeset_id); -- --- Name: relations_timestamp_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: relations_timestamp_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX relations_timestamp_idx ON relations USING btree ("timestamp"); -- --- Name: unique_schema_migrations; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: unique_schema_migrations; Type: INDEX; Schema: public; Owner: - -- CREATE UNIQUE INDEX unique_schema_migrations ON schema_migrations USING btree (version); -- --- Name: user_id_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: user_id_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX user_id_idx ON friends USING btree (friend_user_id); -- --- Name: user_openid_url_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: user_roles_id_role_unique; Type: INDEX; Schema: public; Owner: - -- -CREATE UNIQUE INDEX user_openid_url_idx ON users USING btree (openid_url); +CREATE UNIQUE INDEX user_roles_id_role_unique ON user_roles USING btree (user_id, role); -- --- Name: user_roles_id_role_unique; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: user_tokens_token_idx; Type: INDEX; Schema: public; Owner: - -- -CREATE UNIQUE INDEX user_roles_id_role_unique ON user_roles USING btree (user_id, role); +CREATE UNIQUE INDEX user_tokens_token_idx ON user_tokens USING btree (token); -- --- Name: user_tokens_token_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: user_tokens_user_id_idx; Type: INDEX; Schema: public; Owner: - -- -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: user_tokens_user_id_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: users_auth_idx; Type: INDEX; Schema: public; Owner: - -- -CREATE INDEX user_tokens_user_id_idx ON user_tokens USING btree (user_id); +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: +-- Name: users_display_name_idx; Type: INDEX; Schema: public; Owner: - -- CREATE UNIQUE INDEX users_display_name_idx ON users USING btree (display_name); -- --- Name: users_display_name_lower_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: users_display_name_lower_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX users_display_name_lower_idx ON users USING btree (lower((display_name)::text)); -- --- Name: users_email_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: users_email_idx; Type: INDEX; Schema: public; Owner: - -- CREATE UNIQUE INDEX users_email_idx ON users USING btree (email); -- --- Name: users_email_lower_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: users_email_lower_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX users_email_lower_idx ON users USING btree (lower((email)::text)); -- --- Name: way_nodes_node_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: way_nodes_node_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX way_nodes_node_idx ON way_nodes USING btree (node_id); -- --- Name: ways_changeset_id_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: ways_changeset_id_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX ways_changeset_id_idx ON ways USING btree (changeset_id); -- --- Name: ways_timestamp_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- Name: ways_timestamp_idx; Type: INDEX; Schema: public; Owner: - -- CREATE INDEX ways_timestamp_idx ON ways USING btree ("timestamp"); @@ -2214,6 +2233,22 @@ ALTER TABLE ONLY diary_entries ADD CONSTRAINT diary_entries_user_id_fkey FOREIGN KEY (user_id) REFERENCES users(id); +-- Name: diary_entry_subscriptions_diary_entry_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: - +-- +-- + +ALTER TABLE ONLY diary_entry_subscriptions + ADD CONSTRAINT diary_entry_subscriptions_diary_entry_id_fkey FOREIGN KEY (diary_entry_id) REFERENCES diary_entries(id); + + +-- +-- Name: diary_entry_subscriptions_user_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY diary_entry_subscriptions + ADD CONSTRAINT diary_entry_subscriptions_user_id_fkey FOREIGN KEY (user_id) REFERENCES users(id); + + -- -- Name: friends_friend_user_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -2458,7 +2493,7 @@ ALTER TABLE ONLY ways -- PostgreSQL database dump complete -- -SET search_path TO "$user",public; +SET search_path TO "$user", public; INSERT INTO schema_migrations (version) VALUES ('1'); @@ -2536,6 +2571,8 @@ INSERT INTO schema_migrations (version) VALUES ('20121203124841'); INSERT INTO schema_migrations (version) VALUES ('20130328184137'); +INSERT INTO schema_migrations (version) VALUES ('20131029121300'); + INSERT INTO schema_migrations (version) VALUES ('20131212124700'); INSERT INTO schema_migrations (version) VALUES ('20140115192822'); @@ -2552,6 +2589,10 @@ 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 ('20150818224516'); + INSERT INTO schema_migrations (version) VALUES ('21'); INSERT INTO schema_migrations (version) VALUES ('22'); @@ -2639,4 +2680,3 @@ INSERT INTO schema_migrations (version) VALUES ('7'); INSERT INTO schema_migrations (version) VALUES ('8'); INSERT INTO schema_migrations (version) VALUES ('9'); -