Revision 10107
Added by Aaron Marcuse-Kubitza over 11 years ago
| input.Makefile | ||
|---|---|---|
| 131 | 131 |
##### SVN |
| 132 | 132 |
|
| 133 | 133 |
svnFilesGlob:= */{,$(noImportFile),{,.}{map,VegBIEN}.csv{,.*},*header.*,*.sql,test.xml.ref}
|
| 134 |
svnFilesGlob := {map.csv,*{schema,~}*.sql,{,*/}{*.make,*terms.csv},$(svnFilesGlob)}
|
|
| 134 |
svnFilesGlob := {map.csv,*{schema,grants,~}*.sql,{,*/}{*.make,*terms.csv},$(svnFilesGlob)}
|
|
| 135 | 135 |
_svnFilesGlob := {_MySQL/{,*schema*.sql,*.make},{,*/}{*{run,Makefile},*.{md5,url,pdf},*README.TXT}}
|
| 136 | 136 |
svnFiles = $(filter-out _% logs/% %.data.sql,$(call wildcard/,$(svnFilesGlob)))\ |
| 137 | 137 |
$(call wildcard/,$(_svnFilesGlob)) |
| ... | ... | |
| 223 | 223 |
ifeq ($(schema_only),) # add rest of .sql files |
| 224 | 224 |
dbExports += $(filter-out $(dbExports),$(call dbExportsWildcard,*.sql)) |
| 225 | 225 |
endif |
| 226 |
dbExports := $(filter-out grants.sql,$(dbExports)) |
|
| 226 | 227 |
dbExports := $(strip $(dbExports))# += adds extra whitespace |
| 227 | 228 |
allInstalls := $(if $(dbExports),sql) $(filter-out Source,$(allTables)) |
| 228 | 229 |
|
| ... | ... | |
| 256 | 257 |
|
| 257 | 258 |
# Must come before %/install to override it |
| 258 | 259 |
sql/install: $(dbExports) |
| 259 |
($(inDatasrc); cat $+|pg_dump_limit)|"time" env no_search_path=1 \ |
|
| 260 |
($(inDatasrc); cat $+|pg_dump_limit; $(if $(wildcard\ |
|
| 261 |
grants.sql),cat grants.sql))|"time" env no_search_path=1 \ |
|
| 260 | 262 |
$(bin)/psql_$(if $(debug),verbose,script)_vegbien --set=schema='"$(datasrc)"' \ |
| 261 | 263 |
$(logInstallRoot) |
| 262 | 264 |
|
Also available in: Unified diff
inputs/input.Makefile: added support for separate grants.sql file, which may contain GRANT statements that would normally be filtered out by pg_dump_limit