Merge remote-tracking branch 'upstream/pull/3029'

[rails.git] / db / structure.sql

diff --git a/db/structure.sql b/db/structure.sql
index 82596c0ce3e4240e0a7fd1f947eb71719f26c1cb..89a62626eef8d627d193992b08b817219749e194 100644 (file)
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -1,6 +1,5 @@
 SET statement_timeout = 0;
 SET lock_timeout = 0;
 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 client_encoding = 'UTF8';
 SET standard_conforming_strings = on;
 SELECT pg_catalog.set_config('search_path', '', false);


@@ -9,6 +8,20 @@ SET xmloption = content;
 SET client_min_messages = warning;
 SET row_security = off;
 
 SET client_min_messages = warning;
 SET row_security = off;
 

+--
+-- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: -
+--
+
+CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
+
+
+--
+-- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: -
+--
+
+COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
+
+

 --
 -- Name: btree_gist; Type: EXTENSION; Schema: -; Owner: -
 --
 --
 -- Name: btree_gist; Type: EXTENSION; Schema: -; Owner: -
 --


@@ -116,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', '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', 'tile_for_point';
+  RETURN (x << 1) | y;
+END;
+$$;

 
 
 --
 -- Name: xid_to_int4(xid); Type: FUNCTION; Schema: public; Owner: -
 --
 
 
 
 --
 -- 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', '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 = '';
 
 
 SET default_tablespace = '';


@@ -254,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,
 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

 );
 
 
 );
 
 


@@ -1008,7 +1050,7 @@ ALTER SEQUENCE public.notes_id_seq OWNED BY public.notes.id;
 --
 
 CREATE TABLE public.oauth_nonces (
 --
 
 CREATE TABLE public.oauth_nonces (

-    id integer NOT NULL,
+    id bigint NOT NULL,

     nonce character varying,
     "timestamp" integer,
     created_at timestamp without time zone,
     nonce character varying,
     "timestamp" integer,
     created_at timestamp without time zone,


@@ -1255,9 +1297,9 @@ CREATE TABLE public.user_preferences (
 CREATE TABLE public.user_roles (
     id integer NOT NULL,
     user_id bigint NOT NULL,
 CREATE TABLE public.user_roles (
     id integer NOT NULL,
     user_id bigint NOT NULL,

+    role public.user_role_enum NOT NULL,

     created_at timestamp without time zone,
     updated_at timestamp without time zone,
     created_at timestamp without time zone,
     updated_at timestamp without time zone,

-    role public.user_role_enum NOT NULL,

     granter_id bigint NOT NULL
 );
 
     granter_id bigint NOT NULL
 );
 


@@ -1328,9 +1370,7 @@ CREATE TABLE public.users (
     home_lat double precision,
     home_lon double precision,
     home_zoom smallint DEFAULT 3,
     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,

-    image_file_name text,

     email_valid boolean DEFAULT false NOT NULL,
     new_email character varying,
     creation_ip character varying,
     email_valid boolean DEFAULT false NOT NULL,
     new_email character varying,
     creation_ip character varying,


@@ -1342,12 +1382,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,
     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,
     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
     auth_provider character varying,
     home_tile bigint,
     tou_agreed timestamp without time zone


@@ -2192,6 +2230,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);
 
 
 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: -
 --
 --
 -- Name: index_changeset_comments_on_created_at; Type: INDEX; Schema: public; Owner: -
 --


@@ -3073,6 +3118,11 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20190518115041'),
 ('20190623093642'),
 ('20190702193519'),
 ('20190518115041'),
 ('20190623093642'),
 ('20190702193519'),

+('20190716173946'),
+('20191120140058'),
+('20201006213836'),
+('20201006220807'),
+('20201214144017'),

 ('21'),
 ('22'),
 ('23'),
 ('21'),
 ('22'),
 ('23'),