From 3b0cb09fbb46fcc424cb4fd7b98caf294f8535d7 Mon Sep 17 00:00:00 2001
From: dtookey <dtookey@jdsconsulting.net>
Date: Wed, 19 Jul 2023 08:59:02 -0400
Subject: [PATCH] scoured out all_projects

---
 src/sql/0-run-first/billing.sql       | 6 +++---
 src/sql/0-run-first/contributions.sql | 4 ++--
 src/sql/0-run-first/lifecycle.sql     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/sql/0-run-first/billing.sql b/src/sql/0-run-first/billing.sql
index 94e834e..89f88b4 100644
--- a/src/sql/0-run-first/billing.sql
+++ b/src/sql/0-run-first/billing.sql
@@ -3,15 +3,15 @@ DROP TABLE IF EXISTS billing_report;
 CREATE TABLE billing_report AS
 SELECT billing.pkey,
        refNumber,
-       (SELECT all_projects.proj_type from all_projects where all_projects.refnum = refNumber) AS division,
+       (SELECT projects.proj_type from projects where projects.refnum = refNumber) AS division,
        line_created,
        accepted_date,
        (qty * default_price)                                                                   AS fee,
        invoice_accepted,
        clients.name                                                                            as Client
 FROM billing
-         INNER JOIN all_projects on billing.refNumber = all_projects.refnum
-         INNER JOIN contacts on all_projects.contact_fkey = contacts.pkey
+         INNER JOIN projects on billing.refNumber = projects.refnum
+         INNER JOIN contacts on projects.contact_fkey = contacts.pkey
          INNER JOIN clients on contacts.cl_fkey = clients.pkey
 where invoice_accepted = 1;
 
diff --git a/src/sql/0-run-first/contributions.sql b/src/sql/0-run-first/contributions.sql
index d6b29b9..8edd566 100644
--- a/src/sql/0-run-first/contributions.sql
+++ b/src/sql/0-run-first/contributions.sql
@@ -55,7 +55,7 @@ SELECT CONCAT(users.email)              AS `Technician`,
        ap.description                   AS `Description`
 FROM users
          INNER JOIN project_lifecycle ON pkey = modifier
-         INNER JOIN all_projects ap on project_lifecycle.project_number = ap.refnum
+         INNER JOIN projects ap on project_lifecycle.project_number = ap.refnum
          INNER JOIN contacts on ap.contact_fkey = contacts.pkey
          INNER JOIN clients on contacts.cl_fkey = clients.pkey
 WHERE project_lifecycle.new_value IN ('+READY_FOR_REVIEW')
@@ -96,7 +96,7 @@ SELECT CONCAT(users.email)              AS `Technician`,
        ap.description                   AS `Description`
 FROM users
          INNER JOIN project_lifecycle ON pkey = modifier
-         INNER JOIN all_projects ap on project_lifecycle.project_number = ap.refnum
+         INNER JOIN projects ap on project_lifecycle.project_number = ap.refnum
          INNER JOIN contacts on ap.contact_fkey = contacts.pkey
          INNER JOIN clients on contacts.cl_fkey = clients.pkey
 WHERE project_lifecycle.new_value IN ('+DELIVERED', '+READY_TO_INVOICE');
diff --git a/src/sql/0-run-first/lifecycle.sql b/src/sql/0-run-first/lifecycle.sql
index 21fa6c1..5721c77 100644
--- a/src/sql/0-run-first/lifecycle.sql
+++ b/src/sql/0-run-first/lifecycle.sql
@@ -7,6 +7,6 @@ SELECT DATE(timestamp)                             AS event_date,
        if(SUBSTRING(new_value, 1, 1) = '+', 1, -1) AS event_count,
        SUBSTRING(`new_value` FROM 2)               AS flag
 FROM project_lifecycle
-         INNER JOIN all_projects ON project_lifecycle.project_number = all_projects.refnum
+         INNER JOIN projects ON project_lifecycle.project_number = projects.refnum
 WHERE changed_column = 'status';