X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cd4ac6ac2dfaea3f2c7419d8b6d5e0a9490e286a..cb86e74f69c6b1fe62b06d037396976fadfa3ad8:/db/structure.sql?ds=sidebyside diff --git a/db/structure.sql b/db/structure.sql index 8f4fe3e79..957dee817 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -1,10 +1,10 @@ SET statement_timeout = 0; SET lock_timeout = 0; -SET idle_in_transaction_session_timeout = 0; SET client_encoding = 'UTF8'; SET standard_conforming_strings = on; SELECT pg_catalog.set_config('search_path', '', false); SET check_function_bodies = false; +SET xmloption = content; SET client_min_messages = warning; SET row_security = off; @@ -129,30 +129,59 @@ CREATE TYPE public.user_status_enum AS ENUM ( -- --- Name: maptile_for_point(bigint, bigint, integer); Type: FUNCTION; Schema: public; Owner: - +-- Name: tile_for_point(integer, integer); Type: FUNCTION; Schema: public; Owner: - -- -CREATE FUNCTION public.maptile_for_point(bigint, bigint, integer) RETURNS integer - LANGUAGE c STRICT - AS '$libdir/libpgosm.so', 'maptile_for_point'; +CREATE FUNCTION public.tile_for_point(scaled_lat integer, scaled_lon integer) RETURNS bigint + LANGUAGE plpgsql IMMUTABLE + AS $$ +DECLARE + x int8; -- quantized x from lon, + y int8; -- quantized y from lat, +BEGIN + x := round(((scaled_lon / 10000000.0) + 180.0) * 65535.0 / 360.0); + y := round(((scaled_lat / 10000000.0) + 90.0) * 65535.0 / 180.0); + -- these bit-masks are special numbers used in the bit interleaving algorithm. + -- see https://graphics.stanford.edu/~seander/bithacks.html#InterleaveBMN + -- for the original algorithm and more details. + x := (x | (x << 8)) & 16711935; -- 0x00FF00FF + x := (x | (x << 4)) & 252645135; -- 0x0F0F0F0F + x := (x | (x << 2)) & 858993459; -- 0x33333333 + x := (x | (x << 1)) & 1431655765; -- 0x55555555 --- --- Name: tile_for_point(integer, integer); Type: FUNCTION; Schema: public; Owner: - --- + y := (y | (y << 8)) & 16711935; -- 0x00FF00FF + y := (y | (y << 4)) & 252645135; -- 0x0F0F0F0F + y := (y | (y << 2)) & 858993459; -- 0x33333333 + y := (y | (y << 1)) & 1431655765; -- 0x55555555 -CREATE FUNCTION public.tile_for_point(integer, integer) RETURNS bigint - LANGUAGE c STRICT - AS '$libdir/libpgosm.so', 'tile_for_point'; + RETURN (x << 1) | y; +END; +$$; -- -- Name: xid_to_int4(xid); Type: FUNCTION; Schema: public; Owner: - -- -CREATE FUNCTION public.xid_to_int4(xid) RETURNS integer - LANGUAGE c IMMUTABLE STRICT - AS '$libdir/libpgosm.so', 'xid_to_int4'; +CREATE FUNCTION public.xid_to_int4(t xid) RETURNS integer + LANGUAGE plpgsql STRICT + AS $$ +DECLARE + tl bigint; + ti int; +BEGIN + tl := t; + + IF tl >= 2147483648 THEN + tl := tl - 4294967296; + END IF; + + ti := tl; + + RETURN ti; +END; +$$; SET default_tablespace = ''; @@ -267,8 +296,8 @@ ALTER SEQUENCE public.active_storage_blobs_id_seq OWNED BY public.active_storage CREATE TABLE public.ar_internal_metadata ( key character varying NOT NULL, value character varying, - created_at timestamp without time zone NOT NULL, - updated_at timestamp without time zone NOT NULL + created_at timestamp(6) without time zone NOT NULL, + updated_at timestamp(6) without time zone NOT NULL ); @@ -691,7 +720,8 @@ CREATE TABLE public.diary_entry_subscriptions ( CREATE TABLE public.friends ( id bigint NOT NULL, user_id bigint NOT NULL, - friend_user_id bigint NOT NULL + friend_user_id bigint NOT NULL, + created_at timestamp without time zone ); @@ -1021,7 +1051,7 @@ ALTER SEQUENCE public.notes_id_seq OWNED BY public.notes.id; -- CREATE TABLE public.oauth_nonces ( - id integer NOT NULL, + id bigint NOT NULL, nonce character varying, "timestamp" integer, created_at timestamp without time zone, @@ -1341,9 +1371,7 @@ CREATE TABLE public.users ( home_lat double precision, home_lon double precision, home_zoom smallint DEFAULT 3, - nearby integer DEFAULT 50, pass_salt character varying, - image_file_name text, email_valid boolean DEFAULT false NOT NULL, new_email character varying, creation_ip character varying, @@ -1355,12 +1383,10 @@ CREATE TABLE public.users ( preferred_editor character varying, terms_seen boolean DEFAULT false NOT NULL, description_format public.format_enum DEFAULT 'markdown'::public.format_enum NOT NULL, - image_fingerprint character varying, 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 false NOT NULL, - image_content_type character varying, auth_provider character varying, home_tile bigint, tou_agreed timestamp without time zone @@ -2121,13 +2147,6 @@ CREATE INDEX diary_entry_language_code_created_at_index ON public.diary_entries CREATE INDEX diary_entry_user_id_created_at_index ON public.diary_entries USING btree (user_id, created_at); --- --- Name: friends_user_id_idx; Type: INDEX; Schema: public; Owner: - --- - -CREATE INDEX friends_user_id_idx ON public.friends USING btree (user_id); - - -- -- Name: gpx_file_tags_gpxid_idx; Type: INDEX; Schema: public; Owner: - -- @@ -2205,6 +2224,13 @@ CREATE UNIQUE INDEX index_active_storage_attachments_uniqueness ON public.active CREATE UNIQUE INDEX index_active_storage_blobs_on_key ON public.active_storage_blobs USING btree (key); +-- +-- Name: index_changeset_comments_on_changeset_id_and_created_at; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_changeset_comments_on_changeset_id_and_created_at ON public.changeset_comments USING btree (changeset_id, created_at); + + -- -- Name: index_changeset_comments_on_created_at; Type: INDEX; Schema: public; Owner: - -- @@ -2247,6 +2273,13 @@ CREATE INDEX index_client_applications_on_user_id ON public.client_applications CREATE INDEX index_diary_entry_subscriptions_on_diary_entry_id ON public.diary_entry_subscriptions USING btree (diary_entry_id); +-- +-- Name: index_friends_on_user_id_and_created_at; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_friends_on_user_id_and_created_at ON public.friends USING btree (user_id, created_at); + + -- -- Name: index_issue_comments_on_issue_id; Type: INDEX; Schema: public; Owner: - -- @@ -3086,6 +3119,12 @@ INSERT INTO "schema_migrations" (version) VALUES ('20190518115041'), ('20190623093642'), ('20190702193519'), +('20190716173946'), +('20191120140058'), +('20201006213836'), +('20201006220807'), +('20201214144017'), +('20210511104518'), ('21'), ('22'), ('23'),