Revision 8214
Added by Aaron Marcuse-Kubitza almost 12 years ago
| lib/import.sh | ||
|---|---|---|
| 37 | 37 |
map_table () |
| 38 | 38 |
{
|
| 39 | 39 |
make --directory=.. --makefile=../input.Makefile "$table"/map.csv |
| 40 |
(psql <<EOF
|
|
| 40 |
psql <<EOF |
|
| 41 | 41 |
SELECT util.reset_map_table('pg_temp.map');
|
| 42 | 42 |
\copy pg_temp.map FROM 'map.csv' CSV HEADER; |
| 43 | 43 |
SELECT util.set_col_names('"$table"', 'pg_temp.map'::regclass);
|
| 44 | 44 |
EOF |
| 45 |
) |
|
| 46 | 45 |
} |
| 47 | 46 |
|
| 48 | 47 |
mk_derived () { "$root_dir"/schemas/VegCore/mk_derived; }
|
Also available in: Unified diff
lib/import.sh: map_table(): Removed unneeded () around psql. This also fixes a bug where an error exit status from psql would not have aborted the script because `set -o errexit` does not apply to commands enclosed in (). For () you need to use ` || exit` instead (or ` || return` inside a function).