Integrate stash
This commit is contained in:
commit
f239ef40e3
8 changed files with 119 additions and 32 deletions
|
|
@ -4,6 +4,7 @@ set search_path = public,comptaproc,pg_catalog ;
|
|||
SET statement_timeout = 0;
|
||||
SET lock_timeout = 0;
|
||||
SET idle_in_transaction_session_timeout = 0;
|
||||
SET transaction_timeout = 0;
|
||||
SET client_encoding = 'UTF8';
|
||||
SET standard_conforming_strings = on;
|
||||
SELECT pg_catalog.set_config('search_path', '', false);
|
||||
|
|
@ -14,36 +15,14 @@ SET row_security = off;
|
|||
|
||||
|
||||
SELECT pg_catalog.lo_create('2346174');
|
||||
|
||||
|
||||
|
||||
SELECT pg_catalog.lo_create('2346176');
|
||||
|
||||
|
||||
|
||||
SELECT pg_catalog.lo_create('2346177');
|
||||
|
||||
|
||||
|
||||
SELECT pg_catalog.lo_create('2346178');
|
||||
|
||||
|
||||
|
||||
SELECT pg_catalog.lo_create('2346179');
|
||||
|
||||
|
||||
|
||||
SELECT pg_catalog.lo_create('2346181');
|
||||
|
||||
|
||||
|
||||
SELECT pg_catalog.lo_create('2346476');
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
INSERT INTO public.action (ac_id, ac_description, ac_module, ac_code) VALUES (800, 'Ajout de fiche', 'fiche', 'FICADD');
|
||||
INSERT INTO public.action (ac_id, ac_description, ac_module, ac_code) VALUES (805, 'Création, modification et effacement de fiche', 'fiche', 'FIC');
|
||||
INSERT INTO public.action (ac_id, ac_description, ac_module, ac_code) VALUES (910, 'création, modification et effacement de catégorie de fiche', 'fiche', 'FICCAT');
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ export TEMPLATE=${DOMAIN}mod1
|
|||
psql -X $TEMPLATE -c "delete from user_local_pref"
|
||||
psql -X $TEMPLATE -c "delete from user_local_pref"
|
||||
|
||||
pg_dump -O -U dany -s $TEMPLATE|grep -v "COMMENT ON SCHEMA public IS 'Standard public schema';" |sed "/^--/d" > schema.sql
|
||||
pg_dump -Ox -U dany -s $TEMPLATE|grep -v "COMMENT ON SCHEMA public IS 'Standard public schema';" |sed "/^--/d" > schema.sql
|
||||
sed -i -e "/COMMENT ON EXTENSION/d" schema.sql
|
||||
sed -i -e "/CREATE EXTENSION/d" schema.sql
|
||||
sed -ne '0,/ADD CONSTRAINT/p' schema.sql > tmpSchema.sql
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
SET statement_timeout = 0;
|
||||
SET lock_timeout = 0;
|
||||
SET idle_in_transaction_session_timeout = 0;
|
||||
SET transaction_timeout = 0;
|
||||
SET client_encoding = 'UTF8';
|
||||
SET standard_conforming_strings = on;
|
||||
SELECT pg_catalog.set_config('search_path', '', false);
|
||||
|
|
@ -16,6 +17,12 @@ CREATE SCHEMA comptaproc;
|
|||
|
||||
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
|
||||
|
||||
>>>>>>> review-stash
|
||||
CREATE SCHEMA tva_belge;
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue