Merge branch 'pull/2486'

[rails.git] / db / structure.sql

diff --git a/db/structure.sql b/db/structure.sql
index 75edb001e21f4c7381797868e6d63453054dda06..89a62626eef8d627d193992b08b817219749e194 100644 (file)
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -128,31 +128,6 @@ CREATE TYPE public.user_status_enum AS ENUM (
 );
 
 
 );
 
 

---
--- Name: maptile_for_point(bigint, bigint, integer); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.maptile_for_point(scaled_lat bigint, scaled_lon bigint, zoom integer) RETURNS integer
-    LANGUAGE plpgsql IMMUTABLE
-    AS $$
-DECLARE
-  lat CONSTANT DOUBLE PRECISION := scaled_lat / 10000000.0;
-  lon CONSTANT DOUBLE PRECISION := scaled_lon / 10000000.0;
-  zscale CONSTANT DOUBLE PRECISION := 2.0 ^ zoom;
-  pi CONSTANT DOUBLE PRECISION := 3.141592653589793;
-  r_per_d CONSTANT DOUBLE PRECISION := pi / 180.0;
-  x int4;
-  y int4;
-BEGIN
-  -- straight port of the C code. see db/functions/maptile.c
-  x := floor((lon + 180.0) * zscale / 360.0);
-  y := floor((1.0 - ln(tan(lat * r_per_d) + 1.0 / cos(lat * r_per_d)) / pi) * zscale / 2.0);
-
-  RETURN (x << zoom) | y;
-END;
-$$;
-
-

 --
 -- Name: tile_for_point(integer, integer); Type: FUNCTION; Schema: public; Owner: -
 --
 --
 -- Name: tile_for_point(integer, integer); Type: FUNCTION; Schema: public; Owner: -
 --


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


@@ -2255,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: -
 --


@@ -3138,6 +3120,9 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20190702193519'),
 ('20190716173946'),
 ('20191120140058'),
 ('20190702193519'),
 ('20190716173946'),
 ('20191120140058'),

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

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