Project

General

Profile

« Previous | Next » 

Revision 12130

bugfix: schemas/Makefile,vegbien.sql: renamed validation to public_validation to match the suffixed name applied by `make schemas/public/install`

View differences:

trunk/schemas/Makefile
58 58
	# one for the most recently-created public schema. this allows validations
59 59
	# to continue to be run against a previous version of the DB while a new
60 60
	# version is being imported.
61
	<$< $(sed) -e 's/( )(validation)([,; ])/\1"$*_\2"\3/g'$(if\
61
	<$< $(sed) -e 's/( )public(_validation)([,; ])/\1"$*\2"\3/g'$(if\
62 62
$(filter public,$*),, -e 's/( )public([,; ])/\1"$*"\2/g')|$(psqlNoSearchPath)
63 63

  
64 64
%/uninstall: vegbien.sql _always
......
99 99

  
100 100
vegbien.sql:
101 101
	# include schemas that depend on `public` so they are restored along with it
102
	unset version dump_opts; $(call pg_dump,public --schema=validation)
102
	unset version dump_opts; $(call pg_dump,public --schema=public_validation)
103 103

  
104 104
py_util.sql:
105 105
	env owners=1 $(call pg_dump,py_util)
trunk/schemas/vegbien.my.sql
10 10

  
11 11

  
12 12
--
13
-- Name: validation; Type: SCHEMA; Schema: -; Owner: -
13
-- Name: public_validation; Type: SCHEMA; Schema: -; Owner: -
14 14
--
15 15

  
16
CREATE SCHEMA validation;
16
CREATE SCHEMA public_validation;
17 17

  
18 18

  
19 19
--
20
-- Name: SCHEMA validation; Type: COMMENT; Schema: -; Owner: -
20
-- Name: SCHEMA public_validation; Type: COMMENT; Schema: -; Owner: -
21 21
--
22 22

  
23 23

  
......
9081 9081

  
9082 9082

  
9083 9083
--
9084
-- Name: validation; Type: ACL; Schema: -; Owner: -
9084
-- Name: public_validation; Type: ACL; Schema: -; Owner: -
9085 9085
--
9086 9086

  
9087 9087

  
trunk/schemas/vegbien.sql
10 10
SET client_min_messages = warning;
11 11

  
12 12
--
13
-- Name: validation; Type: SCHEMA; Schema: -; Owner: -
13
-- Name: public_validation; Type: SCHEMA; Schema: -; Owner: -
14 14
--
15 15

  
16
CREATE SCHEMA validation;
16
CREATE SCHEMA public_validation;
17 17

  
18 18

  
19 19
--
20
-- Name: SCHEMA validation; Type: COMMENT; Schema: -; Owner: -
20
-- Name: SCHEMA public_validation; Type: COMMENT; Schema: -; Owner: -
21 21
--
22 22

  
23
COMMENT ON SCHEMA validation IS 'queries used in the aggregating validations';
23
COMMENT ON SCHEMA public_validation IS 'queries used in the aggregating public_validations';
24 24

  
25 25

  
26 26
SET search_path = public, pg_catalog;
......
10819 10819

  
10820 10820

  
10821 10821
--
10822
-- Name: validation; Type: ACL; Schema: -; Owner: -
10822
-- Name: public_validation; Type: ACL; Schema: -; Owner: -
10823 10823
--
10824 10824

  
10825
REVOKE ALL ON SCHEMA validation FROM PUBLIC;
10826
REVOKE ALL ON SCHEMA validation FROM bien;
10827
GRANT ALL ON SCHEMA validation TO bien;
10828
GRANT USAGE ON SCHEMA validation TO bien_read;
10829
GRANT USAGE ON SCHEMA validation TO public_;
10825
REVOKE ALL ON SCHEMA public_validation FROM PUBLIC;
10826
REVOKE ALL ON SCHEMA public_validation FROM bien;
10827
GRANT ALL ON SCHEMA public_validation TO bien;
10828
GRANT USAGE ON SCHEMA public_validation TO bien_read;
10829
GRANT USAGE ON SCHEMA public_validation TO public_;
10830 10830

  
10831 10831

  
10832 10832
--

Also available in: Unified diff