Advertisement
Guest User

Untitled

a guest
Aug 22nd, 2019
81
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.41 KB | None | 0 0
  1. diff --git a/java/Makefile b/java/Makefile
  2. index 77c633e5..c1f11e0d 100644
  3. --- a/java/Makefile
  4. +++ b/java/Makefile
  5. @@ -28,19 +28,9 @@ redis-dev:
  6. prettier:
  7. prettier --write '../rn/src/**/!(*.graphql).js'
  8.  
  9. -# this only inserts the data, so if you do it twice you'll get PK errors, see reset_dev_data to start from scratch
  10. .PHONY: insert_dev_data
  11. insert_dev_data:
  12. - ./src/test/resources/devdata/insert_dev_data.sh $(DBNAME)
  13. -
  14. -.PHONY: reset_dev_data
  15. -reset_dev_data:
  16. - ./src/test/resources/devdata/delete_dev_data.sh $(DBNAME)
  17. - @$(MAKE) insert_dev_data
  18. -
  19. -.PHONY: delete_dev_data
  20. -delete_dev_data:
  21. - ./src/test/resources/devdata/delete_dev_data.sh $(DBNAME) true
  22. + ./src/test/resources/docker/postgres/initdb/data/insert.sh $(DBNAME)
  23.  
  24.  
  25. .PHONY: dropdb
  26. diff --git a/java/src/test/resources/docker/postgres/initdb/data/insert.sh b/java/src/test/resources/docker/postgres/initdb/data/insert.sh
  27. index 659f362c..740051f7 100755
  28. --- a/java/src/test/resources/docker/postgres/initdb/data/insert.sh
  29. +++ b/java/src/test/resources/docker/postgres/initdb/data/insert.sh
  30. @@ -5,5 +5,5 @@ for filename in ${DIR}/csv/*; do
  31. header=$(head -n 1 ${filename})
  32. filename_no_path="${filename##*/}"
  33. table_name="${filename_no_path%.*}"
  34. - cat ${filename} | psql -d margin -c "COPY ${table_name}(${header}) FROM STDIN DELIMITER ',' CSV HEADER"
  35. + cat ${filename} | psql -d ${1-margin} -c "COPY ${table_name}(${header}) FROM STDIN DELIMITER ',' CSV HEADER"
  36. done;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement