From 8c8c9623e7b7d5980b32e0264c12268ff6e34ace Mon Sep 17 00:00:00 2001
From: "Karl O. Pinc kop@karlpinc.com" <kop@karlpinc.com>
Date: Sat, 6 Jun 2026 00:00:32 +0000
Subject: [PATCH] Remove the ARRIVALS_A.ArAID column and use EID as the primary
 key

---
 db/schemas/lib/triggers/create/arrivals_a.m4  |  6 ++---
 .../sokwedb/indexes/create/arrivals_a.m4      |  5 -----
 db/schemas/sokwedb/indexes/drop/arrivals_a.m4 |  3 ---
 .../sokwedb/tables/create/arrivals_a.m4       |  5 +++--
 doc/diagrams/events.svg                       | 22 ++-----------------
 doc/src/epilog.inc.m4                         |  2 --
 doc/src/tables/arrivals_a.m4                  | 11 +---------
 7 files changed, 9 insertions(+), 45 deletions(-)

diff --git a/db/schemas/lib/triggers/create/arrivals_a.m4 b/db/schemas/lib/triggers/create/arrivals_a.m4
index 35ba84a..2ba8d2b 100644
--- a/db/schemas/lib/triggers/create/arrivals_a.m4
+++ b/db/schemas/lib/triggers/create/arrivals_a.m4
@@ -36,7 +36,7 @@ CREATE OR REPLACE FUNCTION arrivals_a_func ()
                  `The Meme Factory, Inc., www.karlpinc.com')
 
   IF TG_OP = 'UPDATE' THEN
-    cannot_change(`ARRIVALS_A', `ArAID')
+    cannot_change(`ARRIVALS_A', `EID')
   END IF;
 
   -- The EVENTS.Behavior must be sdb_arrival
@@ -74,8 +74,8 @@ CREATE OR REPLACE FUNCTION arrivals_a_func ()
             , DETAIL = 'Arrivals at the feeding station can only be related'
                        || ' to an event with an'
                        || ' EVENTS.Behavior value of (sdb_arrival_a)'
-                       || ': Key (AArID = ('
-                       || NEW.aarid
+                       || ': Key (EID = ('
+                       || NEW.eid
                        || '): Value (Cycle) = ('
                        || NEW.cycle
                        || '): Value (DataSource) = ('
diff --git a/db/schemas/sokwedb/indexes/create/arrivals_a.m4 b/db/schemas/sokwedb/indexes/create/arrivals_a.m4
index 8d8c9c3..c455fa5 100644
--- a/db/schemas/sokwedb/indexes/create/arrivals_a.m4
+++ b/db/schemas/sokwedb/indexes/create/arrivals_a.m4
@@ -21,11 +21,6 @@ include(`copyright.m4')dnl
 include(`constants.m4')dnl
 include(`indexmacros.m4')dnl
 
-CREATE UNIQUE INDEX IF NOT EXISTS
-  "ARRIVALS_A has, at most, a 1-to-1 relationship with EVENTS"
-  ON arrivals_a
-  (eid);
-
 CREATE INDEX IF NOT EXISTS arrivals_a_swelling ON arrivals_a
   (swelling);
 
diff --git a/db/schemas/sokwedb/indexes/drop/arrivals_a.m4 b/db/schemas/sokwedb/indexes/drop/arrivals_a.m4
index 912e732..90320a6 100644
--- a/db/schemas/sokwedb/indexes/drop/arrivals_a.m4
+++ b/db/schemas/sokwedb/indexes/drop/arrivals_a.m4
@@ -21,7 +21,4 @@ include(`copyright.m4')dnl
 include(`constants.m4')dnl
 include(`indexmacros.m4')dnl
 
-DROP INDEX IF EXISTS
-  "ARRIVALS_A has, at most, a 1-to-1 relationship with EVENTS";
-
 DROP INDEX IF EXISTS arrivals_a_swelling;
diff --git a/db/schemas/sokwedb/tables/create/arrivals_a.m4 b/db/schemas/sokwedb/tables/create/arrivals_a.m4
index 03f28eb..3daa82d 100644
--- a/db/schemas/sokwedb/tables/create/arrivals_a.m4
+++ b/db/schemas/sokwedb/tables/create/arrivals_a.m4
@@ -24,8 +24,7 @@ include(`grants.m4')dnl
 dnl
 
 CREATE TABLE arrivals_a (
-   key_column(`ARRIVALS_A', `ArAID', INTEGER)
-  ,eid INTEGER NOT NULL
+   eid INTEGER NOT NULL
        REFERENCES events
   ,seq INTEGER NOT NULL
        positive_check(`Seq')
@@ -55,4 +54,6 @@ CREATE TABLE arrivals_a (
     CHECK(recorder <> observer2)
 );
 
+eid_primary_key(`ARRIVALS_A')
+
 grant_priv(`ARRIVALS_A')
diff --git a/doc/diagrams/events.svg b/doc/diagrams/events.svg
index 7602540..40d4f5f 100644
--- a/doc/diagrams/events.svg
+++ b/doc/diagrams/events.svg
@@ -822,7 +822,7 @@
      inkscape:pageshadow="2"
      inkscape:zoom="3.6096384"
      inkscape:cx="643.8318"
-     inkscape:cy="615.15857"
+     inkscape:cy="725.97299"
      inkscape:document-units="mm"
      inkscape:current-layer="layer3"
      inkscape:document-rotation="0"
@@ -2960,7 +2960,7 @@
     <g
        id="g1673-0-2"
        style="display:inline"
-       transform="translate(102.38751,125.89581)">
+       transform="translate(102.38751,129.6)">
       <text
          xml:space="preserve"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:2.82223px;line-height:125%;font-family:Sans;-inkscape-font-specification:'Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -3016,24 +3016,6 @@
        height="3.600003"
        x="142.2"
        y="196.2" />
-    <text
-       xml:space="preserve"
-       style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82223px;line-height:125%;font-family:Sans;-inkscape-font-specification:'Sans, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="142.6281"
-       y="184.38974"
-       id="text2102-5-2-4-5-1-7-8-6"><tspan
-         sodipodi:role="line"
-         id="tspan2100-9-1-3-1-7-1-9-1"
-         x="142.6281"
-         y="184.38974"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82223px;font-family:Sans;-inkscape-font-specification:'Sans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:0.264583px">ArAID</tspan></text>
-    <rect
-       style="display:inline;fill:#ff2a2a;fill-opacity:0.000380632;stroke:#000000;stroke-width:0.212704;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.98995"
-       id="rect2104-7-6-7-7-7-1-1-7-5"
-       width="30.600002"
-       height="3.5999939"
-       x="142.2"
-       y="181.8" />
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82223px;line-height:125%;font-family:Sans;-inkscape-font-specification:'Sans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
diff --git a/doc/src/epilog.inc.m4 b/doc/src/epilog.inc.m4
index d0c0e5c..f60a49b 100644
--- a/doc/src/epilog.inc.m4
+++ b/doc/src/epilog.inc.m4
@@ -138,8 +138,6 @@ sdb_generated_rst()dnl
 
 .. |ARRIVALS_A|
    replace:: :ref:`ARRIVALS_A <ARRIVALS_A>`
-.. |ARRIVALS_A.ArAID|
-   replace:: :ref:`ArAID <ARRIVALS_A.ArAID>`
 .. |ARRIVALS_A.EID|
    replace:: :ref:`EID <ARRIVALS_A.EID>`
 .. |ARRIVALS_A.Seq|
diff --git a/doc/src/tables/arrivals_a.m4 b/doc/src/tables/arrivals_a.m4
index 71ac5b8..b76e380 100644
--- a/doc/src/tables/arrivals_a.m4
+++ b/doc/src/tables/arrivals_a.m4
@@ -64,16 +64,6 @@ The |ARRIVALS_A.Recorder| value may not be the same as the
    :depth: 2
 
 
-.. _ARRIVALS_A.ArAID:
-
-ArAID (Arrivals_A ID)
-`````````````````````
-
-.. |ARRIVALS_A.ArAID_summary| replace:: |idcol|
-
-|ARRIVALS_A.ArAID_summary| |notnull|
-
-
 .. _ARRIVALS_A.EID:
 
 EID (Event ID)
@@ -83,6 +73,7 @@ EID (Event ID)
 
    The |EVENTS|.\ |EVENTS.EID| identifying the feeding station arrival
    event that is related to the arrival and departure.
+   |idcol|
 
 |ARRIVALS_A.EID_summary|
 The related event contains information on arrival and departure times.
-- 
2.34.1