cartodb/cartodb-postgresql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move DDL triggers and extension postamble under scripts-available

Browse Source 
Target 0.2.0
This commit is contained in:
Sandro Santilli 2014-05-23 17:40:14 +02:00
parent 213cf0aee2
commit 09cf368d62
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -1,12 +1,14 @@
# cartodb/Makefile # cartodb/Makefile
EXTENSION = cartodb EXTENSION = cartodb
EXTVERSION = 0.1.0 EXTVERSION = 0.2.0dev
CDBSCRIPTS = \ CDBSCRIPTS = \
scripts-available/CDB_Roles.sql \ scripts-available/CDB_Roles.sql \
scripts-enabled/*.sql \ scripts-enabled/*.sql \
scripts-available/CDB_SearchPath.sql \ scripts-available/CDB_SearchPath.sql \
scripts-available/CDB_DDLTriggers.sql \
scripts-available/CDB_ExtensionPost.sql \
$(END) $(END)
DATA_built = \ DATA_built = \
@ -25,15 +27,13 @@ PG_CONFIG = pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs) PGXS := $(shell $(PG_CONFIG) --pgxs)
include $(PGXS) include $(PGXS)
$(EXTENSION)--$(EXTVERSION).sql: $(CDBSCRIPTS) cartodb_hooks.sql cartodb_version.sql cartodb_config_dump.sql Makefile $(EXTENSION)--$(EXTVERSION).sql: $(CDBSCRIPTS) cartodb_version.sql Makefile
echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@ echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@
cat $(CDBSCRIPTS) | \ cat $(CDBSCRIPTS) | \
sed -e 's/\<public\./cartodb./g' \ sed -e 's/\<public\./cartodb./g' \
-e 's/:DATABASE_USERNAME/cdb_org_admin/g' >> $@ -e 's/:DATABASE_USERNAME/cdb_org_admin/g' >> $@
echo "GRANT USAGE ON SCHEMA cartodb TO public;" >> $@ echo "GRANT USAGE ON SCHEMA cartodb TO public;" >> $@
cat cartodb_hooks.sql >> $@
cat cartodb_version.sql >> $@ cat cartodb_version.sql >> $@
cat cartodb_config_dump.sql >> $@
$(EXTENSION)--unpackaged--$(EXTVERSION).sql: $(EXTENSION)--$(EXTVERSION).sql util/create_from_unpackaged.sh Makefile $(EXTENSION)--unpackaged--$(EXTVERSION).sql: $(EXTENSION)--$(EXTVERSION).sql util/create_from_unpackaged.sh Makefile
./util/create_from_unpackaged.sh $(EXTVERSION) ./util/create_from_unpackaged.sh $(EXTVERSION)

4
NEWS
View File

@ -1,3 +1,7 @@
0.2.0dev - 2014-MM-DD
------------------
0.1.0 - 2014-05-23 0.1.0 - 2014-05-23
------------------ ------------------

0
cartodb_hooks.sql → scripts-available/CDB_DDLTriggers.sql
View File

0
cartodb_config_dump.sql → scripts-available/CDB_ExtensionPost.sql
View File