From 898536cfe1520f5da4efd95fed5dfa4844081079 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc kop@karlpinc.com" Date: Wed, 27 May 2026 19:41:29 +0000 Subject: [PATCH] Change column name: AGGRESSIONS.Community ->CommID Make consistent with other column names. Per 2026-05-26 meeting. --- conversion/load_aggressions.m4 | 2 +- db/schemas/lib/triggers/create/aggressions.m4 | 4 ++-- db/schemas/sokwedb/indexes/create/aggressions.m4 | 4 ++-- db/schemas/sokwedb/indexes/drop/aggressions.m4 | 2 +- db/schemas/sokwedb/tables/create/aggressions.m4 | 2 +- doc/diagrams/events.svg | 2 +- doc/src/epilog.inc.m4 | 4 ++-- doc/src/tables/aggressions.m4 | 12 ++++++------ 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/conversion/load_aggressions.m4 b/conversion/load_aggressions.m4 index 14b5f50..74aaf9a 100644 --- a/conversion/load_aggressions.m4 +++ b/conversion/load_aggressions.m4 @@ -109,7 +109,7 @@ BEGIN ,aggressorbehavior ,recipientbehavior ,fullaccount - ,community + ,commid ,extractedby) SELECT CURRVAL('events_eid_seq') diff --git a/db/schemas/lib/triggers/create/aggressions.m4 b/db/schemas/lib/triggers/create/aggressions.m4 index 7f42024..18a8139 100644 --- a/db/schemas/lib/triggers/create/aggressions.m4 +++ b/db/schemas/lib/triggers/create/aggressions.m4 @@ -95,8 +95,8 @@ CREATE OR REPLACE FUNCTION aggressions_func () || NEW.vocal || '): Value (severity) = (' || NEW.severity - || '): Value (Community) = (' - || NEW.community + || '): Value (CommID) = (' + || NEW.commid || '): Value (ExtractedBy) = (' || NEW.extractedby || '): Key (ROLES.PID) = (' diff --git a/db/schemas/sokwedb/indexes/create/aggressions.m4 b/db/schemas/sokwedb/indexes/create/aggressions.m4 index 0eeac56..06c488f 100644 --- a/db/schemas/sokwedb/indexes/create/aggressions.m4 +++ b/db/schemas/sokwedb/indexes/create/aggressions.m4 @@ -26,8 +26,8 @@ CREATE UNIQUE INDEX IF NOT EXISTS ON aggressions (eid); -CREATE INDEX IF NOT EXISTS aggressions_community ON aggressions - (community); +CREATE INDEX IF NOT EXISTS aggressions_commid ON aggressions + (commid); -- There seems little point in indexing: -- Severity -- ExtractedBy diff --git a/db/schemas/sokwedb/indexes/drop/aggressions.m4 b/db/schemas/sokwedb/indexes/drop/aggressions.m4 index d1677d8..c0fe2c6 100644 --- a/db/schemas/sokwedb/indexes/drop/aggressions.m4 +++ b/db/schemas/sokwedb/indexes/drop/aggressions.m4 @@ -24,4 +24,4 @@ include(`indexmacros.m4')dnl DROP INDEX IF EXISTS "AGGRESSIONS has, at most, a 1-to-1 relationship with EVENTS"; -DROP INDEX IF EXISTS aggressions_community; +DROP INDEX IF EXISTS aggressions_commid; diff --git a/db/schemas/sokwedb/tables/create/aggressions.m4 b/db/schemas/sokwedb/tables/create/aggressions.m4 index dc19ada..93ff361 100644 --- a/db/schemas/sokwedb/tables/create/aggressions.m4 +++ b/db/schemas/sokwedb/tables/create/aggressions.m4 @@ -46,7 +46,7 @@ CREATE TABLE aggressions ( notonlyspaces_check(`RecipientBehavior') ,fullaccount TEXT NOT NULL notonlyspaces_check(`FullAccount') - ,community TEXT NOT NULL + ,commid TEXT NOT NULL REFERENCES comm_ids ,extractedby TEXT NOT NULL REFERENCES people diff --git a/doc/diagrams/events.svg b/doc/diagrams/events.svg index a5db8d1..a057050 100644 --- a/doc/diagrams/events.svg +++ b/doc/diagrams/events.svg @@ -2494,7 +2494,7 @@ id="tspan2100-9-1-3-1-8-2-9-2-3" x="29.426243" y="125.07406" - style="stroke-width:0.264583px">Community + style="stroke-width:0.264583px">CommID ` .. |AGGRESSIONS.FullAccount| replace:: :ref:`FullAccount ` -.. |AGGRESSIONS.Community| - replace:: :ref:`Community ` +.. |AGGRESSIONS.CommID| + replace:: :ref:`CommID ` .. |AGGRESSIONS.ExtractedBy| replace:: :ref:`ExtractedBy ` diff --git a/doc/src/tables/aggressions.m4 b/doc/src/tables/aggressions.m4 index e11ea11..b7ad568 100644 --- a/doc/src/tables/aggressions.m4 +++ b/doc/src/tables/aggressions.m4 @@ -57,7 +57,7 @@ supplies information on the individuals involved. The system will generate a warning if the community of the follow is not the community associated with the aggression event. -This means, if the AGGRESSIONS.\ |AGGRESSIONS.Community| is not the +This means, if the AGGRESSIONS.\ |AGGRESSIONS.CommID| is not the |FOLLOWS|.\ |FOLLOWS.Community| of the follow. For further information, including additional data integrity rules, @@ -299,16 +299,16 @@ FullAccount |notnull| -.. _AGGRESSIONS.Community: +.. _AGGRESSIONS.CommID: -Community -````````` +CommID +`````` -.. |AGGRESSIONS.Community_summary| replace:: +.. |AGGRESSIONS.CommID_summary| replace:: The community of the follow, retained as part of the data collected on aggression for historical purposes. -|AGGRESSIONS.Community_summary| +|AGGRESSIONS.CommID_summary| The |COMM_IDS|.\ |COMM_IDS.CommID| of the of the focal. .. note:: -- 2.34.1