fix: populating work/job database at appropriate times

Makefile

@@ -19,7 +19,9 @@ EXCLUDED_SQL := \
  ${SRC}/make_active.sql \
  ${SRC}/create_work_job.sql \
  ${SRC}/lineage_setup.sql \
- ${SRC}/trigger_setup.sql
+ ${SRC}/populate_work_job.sql \
+ ${SRC}/trigger_setup.sql \
+ ${SRC}/update_work_job.sql
 OUT_FILES := \
  $(patsubst ${SRC}/%.sql,${OUT}/%.out,$(filter-out ${EXCLUDED_SQL},${SQL_FILES})) \
  $(patsubst ${SRC}/%.py,${OUT}/%.out,${PY_FILES})
@@ -115,7 +117,7 @@ ${OUT}/autoincrement.out: ${SRC}/autoincrement.sql
 ${OUT}/avoid_correlated_subqueries.out: ${SRC}/avoid_correlated_subqueries.sql
  cat ${MODE} $< | ${ASSAYS} > $@
 
-${OUT}/backing_up.out: ${SRC}/backing_up.sql ${SRC}/create_work_job.sql
+${OUT}/backing_up.out: ${SRC}/backing_up.sql ${SRC}/create_work_job.sql ${SRC}/populate_work_job.sql ${SRC}/update_work_job.sql
  cat ${MODE} $< | ${MEMORY} > $@
 
 ${OUT}/basic_python_query.out: ${SRC}/basic_python_query.py
@@ -183,7 +185,7 @@ ${OUT}/date_sequence.out: ${SRC}/date_sequence.sql
 ${OUT}/dates_times.out: ${SRC}/dates_times.py
  python $< > $@
 
-${OUT}/delete_rows.out: ${SRC}/delete_rows.sql ${SRC}/create_work_job.sql
+${OUT}/delete_rows.out: ${SRC}/delete_rows.sql ${SRC}/create_work_job.sql ${SRC}/populate_work_job.sql
  cat ${MODE} $< | ${MEMORY} > $@
 
 ${OUT}/distinct.out: ${SRC}/distinct.sql
@@ -243,7 +245,7 @@ ${OUT}/insert_delete.out: ${SRC}/insert_delete.py
 ${OUT}/insert_select.out: ${SRC}/insert_select.sql
  cat ${MODE} $< | ${MEMORY} > $@
 
-${OUT}/insert_values.out: ${SRC}/insert_values.sql ${SRC}/create_work_job.sql
+${OUT}/insert_values.out: ${SRC}/insert_values.sql ${SRC}/create_work_job.sql ${SRC}/populate_work_job.sql
  cat ${MODE} $< | ${MEMORY} > $@
 
 ${OUT}/interpolate.out: ${SRC}/interpolate.py
@@ -318,13 +320,13 @@ ${OUT}/readable_aggregation.out: ${SRC}/readable_aggregation.sql
 ${OUT}/recursive_labeling.out: ${SRC}/recursive_labeling.sql
  cat ${MODE} $< | ${CONTACTS} > $@
 
-${OUT}/recursive_lineage.out: ${SRC}/recursive_lineage.sql
+${OUT}/recursive_lineage.out: ${SRC}/recursive_lineage.sql ${SRC}/lineage_setup.sql
  cat ${MODE} $< | ${MEMORY} > $@
 
 ${OUT}/rename_columns.out: ${SRC}/rename_columns.sql
  cat ${MODE} $< | ${PENGUINS} > $@
 
-${OUT}/represent_graph.out: ${SRC}/represent_graph.sql
+${OUT}/represent_graph.out: ${SRC}/represent_graph.sql ${SRC}/lineage_setup.sql
  cat ${MODE} $< | ${MEMORY} > $@
 
 ${OUT}/rollback_constraint.out: ${SRC}/rollback_constraint.sql
@@ -366,9 +368,6 @@ ${OUT}/set_membership.out: ${SRC}/set_membership.sql ${SRC}/create_work_job.sql
 ${OUT}/show_missing_values.out: ${SRC}/show_missing_values.sql
  cat ${MODE} $< | ${PENGUINS} > $@
 
-${OUT}/show_work_job.out: ${SRC}/show_work_job.sql ${SRC}/create_work_job.sql
- cat ${MODE} $< | ${MEMORY} > $@
-
 ${OUT}/simple_group.out: ${SRC}/simple_group.sql
  cat ${MODE} $< | ${PENGUINS} > $@
 
@@ -409,13 +408,13 @@ ${OUT}/update_group_ids.out: ${SRC}/update_group_ids.sql
  cp ${DB}/contact_tracing.db /tmp
  cat ${MODE} $< | ${CONTACTS_TMP} > $@
 
-${OUT}/update_rows.out: ${SRC}/update_rows.sql ${SRC}/create_work_job.sql
+${OUT}/update_rows.out: ${SRC}/update_rows.sql ${SRC}/create_work_job.sql ${SRC}/populate_work_job.sql ${SRC}/update_work_job.sql
  cat ${MODE} $< | ${MEMORY} > $@
 
 ${OUT}/upsert.out: ${SRC}/upsert.sql
  -cat ${MODE} $< | ${MEMORY} >& $@
 
-${OUT}/views.out: ${SRC}/views.sql
+${OUT}/views.out: ${SRC}/views.sql ${SRC}/make_active.sql
  cp ${DB}/penguins.db /tmp
  cat ${MODE} $< | ${PENGUINS_TMP} > $@
 

_data/glossary.yml

@@ -69,7 +69,7 @@
  en:
  term: cross join
  def: >
- A join that creates the cross-product of rows from two tables.
+  A join that creates the cross-product of rows from two tables.
 
 - key: cte
  en:

index.md

@@ -432,7 +432,6 @@ home: true
 {% include h2_numbered.md title="create tables" %}
 
 {% include single.md file="src/create_work_job.sql" %}
-{% include single.md file="out/show_work_job.out" %}
 
 - <code>create table <em>name</em></code> followed by parenthesized list of columns
 - Each column is a name, a data type, and optional extra information
@@ -447,14 +446,16 @@ home: true
 
 {% include h2_numbered.md title="insert data" %}
 
-{% include double.md stem="insert_values" suffix="sql out" %}
+{% include single.md file="src/populate_work_job.sql" %}
+{% include single.md file="out/insert_values.out" %}
 
 </section>
 <section markdown="1">
 
 {% include h2_numbered.md title="update rows" %}
 
-{% include double.md stem="update_rows" suffix="sql out" %}
+{% include single.md file="src/update_work_job.sql" %}
+{% include single.md file="out/update_rows.out" %}
 
 - (Almost) always specify row(w) to update using `where`
  - Would otherwise update all rows

out/aggregate_join.out

@@ -1,8 +1,4 @@
-CREATE TABLE job (
- name text not null,
- billable real not null
-);
-CREATE TABLE work (
- person text not null,
- job text not null
-);
+| person | pay |
+|--------|-----|
+| mik | 2.0 |
+| po | 0.5 |

out/aggregate_left_join.out

@@ -1,8 +1,5 @@
-CREATE TABLE job (
- name text not null,
- billable real not null
-);
-CREATE TABLE work (
- person text not null,
- job text not null
-);
+| person | pay |
+|--------|-----|
+| mik | 2.0 |
+| po | 0.5 |
+| tay | |

out/backing_up.out

@@ -1,8 +1,3 @@
-CREATE TABLE job (
- name text not null,
- billable real not null
-);
-CREATE TABLE work (
- person text not null,
- job text not null
-);
+| person | job |
+|--------|----------|
+| tae | complain |

out/coalesce.out

@@ -1,8 +1,5 @@
-CREATE TABLE job (
- name text not null,
- billable real not null
-);
-CREATE TABLE work (
- person text not null,
- job text not null
-);
+| person | pay |
+|--------|-----|
+| mik | 2.0 |
+| po | 0.5 |
+| tay | 0.0 |

out/cross_join.out

@@ -1,8 +1,14 @@
-CREATE TABLE job (
- name text not null,
- billable real not null
-);
-CREATE TABLE work (
- person text not null,
- job text not null
-);
+| person | job | name | billable |
+|--------|-----------|-----------|----------|
+| mik | calibrate | calibrate | 1.5 |
+| mik | calibrate | clean | 0.5 |
+| mik | clean | calibrate | 1.5 |
+| mik | clean | clean | 0.5 |
+| mik | complain | calibrate | 1.5 |
+| mik | complain | clean | 0.5 |
+| po | clean | calibrate | 1.5 |
+| po | clean | clean | 0.5 |
+| po | complain | calibrate | 1.5 |
+| po | complain | clean | 0.5 |
+| tay | complain | calibrate | 1.5 |
+| tay | complain | clean | 0.5 |

out/delete_rows.out

@@ -1,8 +1,7 @@
-CREATE TABLE job (
- name text not null,
- billable real not null
-);
-CREATE TABLE work (
- person text not null,
- job text not null
-);
+| person | job |
+|--------|-----------|
+| mik | calibrate |
+| mik | clean |
+| mik | complain |
+| po | clean |
+| po | complain |

out/inner_join.out

@@ -1,8 +1,5 @@
-CREATE TABLE job (
- name text not null,
- billable real not null
-);
-CREATE TABLE work (
- person text not null,
- job text not null
-);
+| person | job | name | billable |
+|--------|-----------|-----------|----------|
+| mik | calibrate | calibrate | 1.5 |
+| mik | clean | clean | 0.5 |
+| po | clean | clean | 0.5 |

out/insert_values.out

@@ -1,11 +1,3 @@
-CREATE TABLE job (
- name text not null,
- billable real not null
-);
-CREATE TABLE work (
- person text not null,
- job text not null
-);
 | name | billable |
 |-----------|----------|
 | calibrate | 1.5 |

out/left_join.out

@@ -1,8 +1,8 @@
-CREATE TABLE job (
- name text not null,
-  billable real not null
-);
-CREATE TABLE work (
-  person text not null,
-  job text not null
-);
+| person | job  | name | billable |
+|--------|-----------|-----------|----------|
+| mik  | calibrate | calibrate | 1.5 |
+| mik | clean | clean | 0.5 |
+| mik | complain | | |
+| po  | clean | clean | 0.5 |
+| po  | complain | | |
+| tay | complain | | |

out/negate_incorrectly.out

@@ -1,8 +1,5 @@
-CREATE TABLE job (
- name text not null,
- billable real not null
-);
-CREATE TABLE work (
- person text not null,
- job text not null
-);
+| person |
+|--------|
+| mik |
+| po |
+| tay |

out/random_numbers.out

@@ -1,4 +1,9 @@
-| rand | selector | name |
-|----------------------|----------|-------------|
-| -6001451967753577798 | 7 | Riaan Dua |
-| -5172626638304050554 | 4 | Vedika Rout |
+| rand | selector | name |
+|----------------------|----------|-----------------|
+| 7176652035743196310 | 0 | Divit Dhaliwal |
+| -2243654635505630380 | 2 | Indrans Sridhar |
+| -6940074802089166303 | 5 | Pranay Khanna |
+| 8882650891091088193 | 9 | Riaan Dua |
+| -45079732302991538 | 5 | Vedika Rout |
+| -8973877087806386134 | 2 | Abram Chokshi |
+| 3360598450426870356 | 9 | Romil Kapoor |

out/set_membership.out

@@ -1,8 +1,4 @@
-CREATE TABLE job (
- name text not null,
- billable real not null
-);
-CREATE TABLE work (
- person text not null,
- job text not null
-);
+| person | job |
+|--------|----------|
+| po | clean |
+| po | complain |

out/subquery_set.out

@@ -1,8 +1,4 @@
-CREATE TABLE job (
- name text not null,
- billable real not null
-);
-CREATE TABLE work (
- person text not null,
- job text not null
-);
+| person |
+|--------|
+| po |
+| tay |

out/update_rows.out

@@ -1,8 +1,8 @@
-CREATE TABLE job (
- name text not null,
-  billable real not null
-);
-CREATE TABLE work (
-  person text not null,
-  job text not null
-);
+| person | job  |
+|--------|-----------|
+| mik  | calibrate |
+| mik | clean |
+| mik | complain |
+| po  | clean |
+| po  | complain |
+| tae | complain |

src/aggregate_join.sql

@@ -1,4 +1,5 @@
 .read src/create_work_job.sql
+.read src/populate_work_job.sql
 
 -- start
 select

src/aggregate_left_join.sql

@@ -1,4 +1,5 @@
 .read src/create_work_job.sql
+.read src/populate_work_job.sql
 
 -- start
 select

src/backing_up.sql

@@ -1,4 +1,6 @@
 .read src/create_work_job.sql
+.read src/populate_work_job.sql
+.read src/update_work_job.sql
 
 -- start
 create table backup (

src/coalesce.sql

@@ -1,4 +1,5 @@
 .read src/create_work_job.sql
+.read src/populate_work_job.sql
 
 -- start
 select

src/create_work_job.sql

@@ -1,4 +1,3 @@
--- start
 create table job (
  name text not null,
  billable real not null
@@ -7,5 +6,3 @@ create table work (
  person text not null,
  job text not null
 );
--- end
-.schema

src/cross_join.sql

@@ -1,4 +1,5 @@
 .read src/create_work_job.sql
+.read src/populate_work_job.sql
 
 -- start
 select *

src/delete_rows.sql

@@ -1,4 +1,6 @@
 .read src/create_work_job.sql
+.read src/populate_work_job.sql
+.read src/update_work_job.sql
 
 -- start
 delete from work

src/inner_join.sql

@@ -1,4 +1,5 @@
 .read src/create_work_job.sql
+.read src/populate_work_job.sql
 
 -- start
 select *