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

[rails.git] / db / structure.sql

diff --git a/db/structure.sql b/db/structure.sql
index 03950502c52702b8ce005f0071c648dfaa5ee14c..d0e8c21e3ba32f4213835b506e57efb9b523608a 100644 (file)
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -184,6 +184,30 @@ END;
 $$;
 
 
+--
+-- Name: xid_to_int4(xid); Type: FUNCTION; Schema: public; Owner: -
+--
+
+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_with_oids = false;
@@ -296,8 +320,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
 );
 
 
@@ -1370,7 +1394,6 @@ 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,
     email_valid boolean DEFAULT false NOT NULL,
     new_email character varying,
@@ -3113,6 +3136,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20190623093642'),
 ('20190702193519'),
 ('20190716173946'),
+('20191120140058'),
 ('21'),
 ('22'),
 ('23'),