reorder db build

smnorris · Jan 5, 2024 · 458ad56 · 458ad56
1 parent 4c7f28e
commit 458ad56
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/db/functions/wsg_crossing_summary.sql b/db/functions/wsg_crossing_summary.sql
@@ -5,7 +5,7 @@
 
 CREATE FUNCTION bcfishpass.wsg_crossings_summary()
 RETURNS table (
-watershed_group_code                  text,
+  watershed_group_code                  text,
   crossing_feature_type                 text,
   n_crossings_total                     integer,
   n_passable_total                      integer,

diff --git a/db/functions/wsg_linear_summary.sql b/db/functions/wsg_linear_summary.sql
@@ -10,6 +10,7 @@
 -- - spawning or rearing habitat not isolated by dam or a known pscis barrier (accessible_a)
 -- - spawning or rearing habitat not isolated by all anthropogenic barriers (observed and modelled) (accessible_b)
 
+DROP FUNCTION bcfishpass.wsg_linear_summary();
 CREATE FUNCTION bcfishpass.wsg_linear_summary() 
 RETURNS table (
  watershed_group_code                                     text,

diff --git a/db/setup.sh b/db/setup.sh
@@ -12,10 +12,10 @@ for sql in tables/*.sql ; do
 	$PSQL -f "$sql"
 done
 
-for sql in functions/*.sql ; do
+for sql in views/*.sql ; do
 	$PSQL -f "$sql"
 done
 
-for sql in views/*.sql ; do
+for sql in functions/*.sql ; do
 	$PSQL -f "$sql"
 done