#1088 issues_locations -> issue_locations

CityofToronto · Dec 10, 2024 · 95a124c · 95a124c
1 parent e4f4e1b
commit 95a124c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/events/construction/itsc_issues_functions.py b/events/construction/itsc_issues_functions.py
@@ -173,7 +173,7 @@ def fetch_and_insert_location_data(
     df_no_geom = df_no_geom[cols_to_insert]
     df_no_geom = [tuple(x) for x in df_no_geom.to_numpy()]
 
-    insert_fpath = os.path.join(SQL_DIR, 'insert-itsc_issues_locations.sql')
+    insert_fpath = os.path.join(SQL_DIR, 'insert-itsc_issue_locations.sql')
     with open(insert_fpath, 'r', encoding="utf-8") as file:
         insert_query = sql.SQL(file.read())
 

diff --git a/events/construction/sql/create_table-itsc_issues_locations.sql b/events/construction/sql/create_table-itsc_issues_locations.sql
@@ -1,8 +1,8 @@
--- Table: congestion_events.itsc_issues_locations
+-- Table: congestion_events.itsc_issue_locations
 
--- DROP TABLE IF EXISTS congestion_events.itsc_issues_locations;
+-- DROP TABLE IF EXISTS congestion_events.itsc_issue_locations;
 
-CREATE TABLE IF NOT EXISTS congestion_events.itsc_issues_locations
+CREATE TABLE IF NOT EXISTS congestion_events.itsc_issue_locations
 (
     divisionid smallint NOT NULL,
     issueid integer NOT NULL,
@@ -30,13 +30,13 @@ CREATE TABLE IF NOT EXISTS congestion_events.itsc_issues_locations
 
 TABLESPACE pg_default;
 
-ALTER TABLE IF EXISTS congestion_events.itsc_issues_locations OWNER TO dbadmin;
+ALTER TABLE IF EXISTS congestion_events.itsc_issue_locations OWNER TO dbadmin;
 
-REVOKE ALL ON TABLE congestion_events.itsc_issues_locations FROM bdit_humans;
-GRANT SELECT ON TABLE congestion_events.itsc_issues_locations TO bdit_humans;
+REVOKE ALL ON TABLE congestion_events.itsc_issue_locations FROM bdit_humans;
+GRANT SELECT ON TABLE congestion_events.itsc_issue_locations TO bdit_humans;
 
-GRANT ALL ON TABLE congestion_events.itsc_issues_locations TO dbadmin;
+GRANT ALL ON TABLE congestion_events.itsc_issue_locations TO dbadmin;
 
-GRANT ALL ON TABLE congestion_events.itsc_issues_locations TO rds_superuser WITH GRANT OPTION;
+GRANT ALL ON TABLE congestion_events.itsc_issue_locations TO rds_superuser WITH GRANT OPTION;
 
-GRANT ALL ON TABLE congestion_events.itsc_issues_locations TO vds_bot;
+GRANT ALL ON TABLE congestion_events.itsc_issue_locations TO vds_bot;
diff --git a/...tion/sql/insert-itsc_issues_locations.sql → ...ction/sql/insert-itsc_issue_locations.sql b/...tion/sql/insert-itsc_issues_locations.sql → ...ction/sql/insert-itsc_issue_locations.sql
@@ -1,4 +1,5 @@
 --this redundant CTE is just to apply ST_GeomFromText to geom_text.
+TRUNCATE congestion_events.itsc_issue_locations;
 WITH locations (
     divisionid, issueid, timestamputc, locationindex, mainroadname, fromroadname,
     toroadname, direction_toplevel, lanesaffected, streetnumber, locationtype, groupid,
@@ -10,7 +11,7 @@ WITH locations (
     VALUES %s
 )
 
-INSERT INTO congestion_events.itsc_issues_locations (
+INSERT INTO congestion_events.itsc_issue_locations (
     divisionid, issueid, timestamputc, locationindex, mainroadname, fromroadname, toroadname,
     direction_toplevel, streetnumber, locationtype, groupid, groupdescription, lanesaffected,
     locationblocklevel_toplevel, roadclosuretype_toplevel, encodedcoordinates_toplevel,