Project

General

Profile

« Previous | Next » 

Revision 14825

bugfix: inputs/input.Makefile: $(dbExports): also need to put data.sql before clean_up.sql, etc. previously, this ordering had to be done by naming clean_up.sql, etc so they would sort after data.sql alphabetically, but it can be confusing to have to remember to do this. this fixes a bug in the CVS refresh where cvs.~.clean_up.sql was being run before data.sql, causing some private columns to have been deleted before the data was imported into the tables, creating a column mismatch error.

View differences:

input.Makefile
228 228
dbExportsWildcard = $(sort $(patsubst _MySQL/%.make,%,$(wildcard\
229 229
$(1) _MySQL/$(1).make)))
230 230

  
231
dbExports := $(call dbExportsWildcard,*schema*.sql)# schemas first
231
dbExports := $(call dbExportsWildcard,*schema*.sql *data*.sql)
232
	# schema/data in order, and before clean_up.sql, etc
232 233
ifeq ($(schema_only),) # add rest of .sql files
233 234
dbExports += $(filter-out $(dbExports),$(call dbExportsWildcard,*.sql))
234 235
endif

Also available in: Unified diff