From: Tom Hughes Date: Mon, 15 Jul 2019 07:39:20 +0000 (+0100) Subject: It's to_sym not to_symbol X-Git-Tag: live~3090 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/550fa0c8e46c9d4e09e30f7940bcb63f84f0ac41 It's to_sym not to_symbol --- diff --git a/config/environments/production.rb b/config/environments/production.rb index 90c0c1c40..ba781e5af 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -39,7 +39,7 @@ Rails.application.configure do # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX # Store uploaded files on the local file system (see config/storage.yml for options) - config.active_storage.service = Settings.storage_service.to_symbol + config.active_storage.service = Settings.storage_service.to_sym # Mount Action Cable outside main process or domain # config.action_cable.mount_path = nil diff --git a/db/structure.sql b/db/structure.sql index 8f4fe3e79..82596c0ce 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -5,23 +5,10 @@ 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; --- --- 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: - -- @@ -134,7 +121,7 @@ CREATE TYPE public.user_status_enum AS ENUM ( CREATE FUNCTION public.maptile_for_point(bigint, bigint, integer) RETURNS integer LANGUAGE c STRICT - AS '$libdir/libpgosm.so', 'maptile_for_point'; + AS '$libdir/libpgosm', 'maptile_for_point'; -- @@ -143,7 +130,7 @@ CREATE FUNCTION public.maptile_for_point(bigint, bigint, integer) RETURNS intege CREATE FUNCTION public.tile_for_point(integer, integer) RETURNS bigint LANGUAGE c STRICT - AS '$libdir/libpgosm.so', 'tile_for_point'; + AS '$libdir/libpgosm', 'tile_for_point'; -- @@ -152,7 +139,7 @@ CREATE FUNCTION public.tile_for_point(integer, integer) RETURNS bigint CREATE FUNCTION public.xid_to_int4(xid) RETURNS integer LANGUAGE c IMMUTABLE STRICT - AS '$libdir/libpgosm.so', 'xid_to_int4'; + AS '$libdir/libpgosm', 'xid_to_int4'; SET default_tablespace = ''; @@ -1268,9 +1255,9 @@ CREATE TABLE public.user_preferences ( 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, + role public.user_role_enum NOT NULL, granter_id bigint NOT NULL );