I need to force this through and talk to someone about how to avoid (#38

) * up to date (#1) * Cleanup * Use latest version of docker * Remove Docker first * Remove more of Docker * Start Docker after installing * fixed misspecification * breaking apart the workshop * beginning * finished first page and added to the dir * more scaffolding * more progress * mid progress in page 3 * a little more * done for now * fixing commands * normal typo and bug finding * typo fixes from @davecramer * more general cleanup
CrunchyData · Jul 11, 2019 · 1fd4223 · 1fd4223
1 parent 30e4705
commit 1fd4223
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 197 deletions.
diff --git a/basic-postgresql-devel/basicfunctions/02-name-parameters.md b/basic-postgresql-devel/basicfunctions/02-name-parameters.md
@@ -44,9 +44,9 @@ operator per the SQL standard.
 
 Let's go ahead and use our cool new function!
 
-'''
+```
 select brilliance('student');
-'''{{execute}}
+```{{execute}}
 
 Go ahead and change the name to anything else you want to try. 
 
@@ -72,7 +72,8 @@ Time to exercise our function again:
 
 ```
 select brilliance('student', 1);
-```{execute}}
+```{{execute}}
+
 
 
 ## Default Values for Parameters
@@ -95,6 +96,7 @@ LANGUAGE sql;
 And now if we call our function we will get those values if we don't specify a value. Before we do this we need to drop our
 original function - think about why?....
 
+
 ```
 DROP FUNCTION brilliance();
 ```

diff --git a/basic-postgresql-devel/qjsonintro/set-env.sh b/basic-postgresql-devel/qjsonintro/set-env.sh
@@ -12,7 +12,7 @@ done
 echo 'loading wikipedia data'
 PGPASSWORD="password" psql -h localhost -U groot -f /data/crunchy_demo_data/wikipedia/wikipedia.ddl.sql workshop
 PGPASSWORD="password" psql -h localhost -U groot -d workshop -c '\COPY wikipedia (county, state, json_content, response_attr) from '\''/data/crunchy_demo_data/wikipedia/wikipedia_copy.txt'\'' WITH CSV QUOTE '\''^'\'' '
-echo 'finished county boundaries'
+echo 'finished wikipedia boundaries'
 
 clear
 

diff --git a/postgis/qpostgisinto/01-spatial-data.md b/postgis/qpostgisinto/01-spatial-data.md
diff --git a/postgis/qpostgisinto/assets/docker_ps.jpg b/postgis/qpostgisinto/assets/docker_ps.jpg
diff --git a/postgis/qpostgisinto/env-init.sh b/postgis/qpostgisinto/env-init.sh
diff --git a/postgis/qpostgisinto/finish.md b/postgis/qpostgisinto/finish.md
diff --git a/postgis/qpostgisinto/index.json b/postgis/qpostgisinto/index.json
diff --git a/postgis/qpostgisinto/intro.md b/postgis/qpostgisinto/intro.md
diff --git a/postgis/qpostgisinto/set-env.sh b/postgis/qpostgisinto/set-env.sh
diff --git a/postgis/qpostgisintro/set-env.sh b/postgis/qpostgisintro/set-env.sh
@@ -15,7 +15,9 @@ unzip
 
 echo 'loading storm center points'
 PGPASSWORD="password" psql -h localhost -U groot -f /data/crunchy_demo_data/storms/stormevents.ddl.sql workshop
+PGPASSWORD="password" psql -h localhost -U groot -f /data/crunchy_demo_data/boundaries/county_boundaries.ddl.sql workshop
 PGPASSWORD="password" psql -h localhost -U groot -d workshop -c '\COPY se_locations (episode_id, event_id, location_index, range, azimuth, location, latitude, longitude, the_geom) from '\''/data/crunchy_demo_data/storms/storm_locations_copy.txt'\'' WITH CSV QUOTE '\''"'\'' '
+PGPASSWORD="password" psql -h localhost -U groot -d workshop -c '\COPY county_geometry (statefp, countyfp, countyns, geoid, county_name, namelsad, funcstat, aland, awater, interior_pnt, the_geom) from ''\''/data/crunchy_demo_data/boundaries/county_boundaries_copy.txt'\'' WITH CSV QUOTE '\''"'\'' '
 echo 'finished storm center points'
 
 : 'ready to go!'