From a87323ded6d5e55c821a3283afbe8c3775d6ff80 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc kop@karlpinc.com" Date: Wed, 27 May 2026 19:27:09 +0000 Subject: [PATCH] Change column name: AGGRESSION_EVENT_LOG.Community ->CommID Make consistent with other column names. Per 2026-05-26 meeting. --- conversion/load_aggression_event_log.sql | 2 +- .../sokwedb/indexes/create/aggression_event_log.m4 | 4 ++-- .../sokwedb/indexes/drop/aggression_event_log.m4 | 2 +- .../sokwedb/tables/create/aggression_event_log.m4 | 4 ++-- doc/src/epilog.inc.m4 | 4 ++-- doc/src/tables/aggression_event_log.m4 | 10 +++++----- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/conversion/load_aggression_event_log.sql b/conversion/load_aggression_event_log.sql index cf76e69..5a7f822 100644 --- a/conversion/load_aggression_event_log.sql +++ b/conversion/load_aggression_event_log.sql @@ -22,7 +22,7 @@ SET search_path TO sokwedb, codes, lib, clean, libconv; -- aggression_event_log -> aggression_event_log INSERT INTO aggression_event_log ( year - ,community + ,commid ,brecenglish ,arecswahili ,arecenglishnotes diff --git a/db/schemas/sokwedb/indexes/create/aggression_event_log.m4 b/db/schemas/sokwedb/indexes/create/aggression_event_log.m4 index 9202e9a..2b2fdee 100644 --- a/db/schemas/sokwedb/indexes/create/aggression_event_log.m4 +++ b/db/schemas/sokwedb/indexes/create/aggression_event_log.m4 @@ -22,8 +22,8 @@ include(`constants.m4')dnl include(`indexmacros.m4')dnl CREATE UNIQUE INDEX IF NOT EXISTS - "On AGGRESSION_EVENT_LOG, Year + Community must be unique" + "On AGGRESSION_EVENT_LOG, Year + CommID must be unique" ON aggression_event_log - (year, community); + (year, commid); diff --git a/db/schemas/sokwedb/indexes/drop/aggression_event_log.m4 b/db/schemas/sokwedb/indexes/drop/aggression_event_log.m4 index ebbf28f..63f8ba4 100644 --- a/db/schemas/sokwedb/indexes/drop/aggression_event_log.m4 +++ b/db/schemas/sokwedb/indexes/drop/aggression_event_log.m4 @@ -22,4 +22,4 @@ include(`constants.m4')dnl include(`indexmacros.m4')dnl DROP INDEX IF EXISTS - "On AGGRESSION_EVENT_LOG, Year + Community must be unique"; + "On AGGRESSION_EVENT_LOG, Year + CommID must be unique"; diff --git a/db/schemas/sokwedb/tables/create/aggression_event_log.m4 b/db/schemas/sokwedb/tables/create/aggression_event_log.m4 index 831b6b6..40d8182 100644 --- a/db/schemas/sokwedb/tables/create/aggression_event_log.m4 +++ b/db/schemas/sokwedb/tables/create/aggression_event_log.m4 @@ -28,8 +28,8 @@ CREATE TABLE aggression_event_log ( ,year INTEGER NOT NULL CONSTRAINT "Year cannot be before sdb_first_aggression_event_log_year" CHECK (year >= sdb_first_aggression_event_log_year) - ,community TEXT NOT NULL - CONSTRAINT "Community must be a COMM_IDS.CommID value" + ,commid TEXT NOT NULL + CONSTRAINT "CommID must be a COMM_IDS.CommID value" REFERENCES comm_ids ,brecenglish TEXT NOT NULL notonlyspaces_check(`BRecEnglish') diff --git a/doc/src/epilog.inc.m4 b/doc/src/epilog.inc.m4 index 7da4f10..c6c18dd 100644 --- a/doc/src/epilog.inc.m4 +++ b/doc/src/epilog.inc.m4 @@ -61,8 +61,8 @@ sdb_generated_rst()dnl replace:: :ref:`ID ` .. |AGGRESSION_EVENT_LOG.Year| replace:: :ref:`Year ` -.. |AGGRESSION_EVENT_LOG.Community| - replace:: :ref:`Community ` +.. |AGGRESSION_EVENT_LOG.CommID| + replace:: :ref:`CommID ` .. |AGGRESSION_EVENT_LOG.BRecEnglish| replace:: :ref:`BRecEnglish ` .. |AGGRESSION_EVENT_LOG.ARecSwahili| diff --git a/doc/src/tables/aggression_event_log.m4 b/doc/src/tables/aggression_event_log.m4 index 2dc001f..25a694b 100644 --- a/doc/src/tables/aggression_event_log.m4 +++ b/doc/src/tables/aggression_event_log.m4 @@ -32,7 +32,7 @@ AGGRESSION_EVENT_LOG |AGGRESSION_EVENT_LOG_summary| -The combination of |AGGRESSION_EVENT_LOG.Community| and +The combination of |AGGRESSION_EVENT_LOG.CommID| and |AGGRESSION_EVENT_LOG.Year| must be unique. @@ -64,15 +64,15 @@ This value may not be before ``sdb_first_aggression_event_log_year``. |notnull| -.. _AGGRESSION_EVENT_LOG.Community: +.. _AGGRESSION_EVENT_LOG.CommID: -Community +CommID ````````` -.. |AGGRESSION_EVENT_LOG.Community_summary| replace:: +.. |AGGRESSION_EVENT_LOG.CommID_summary| replace:: The community of the information recorded in the row. -|AGGRESSION_EVENT_LOG.Community_summary| +|AGGRESSION_EVENT_LOG.CommID_summary| The |COMM_IDS|.\ |COMM_IDS.CommID| of the community of the information recorded in the row. -- 2.34.1