move adjoints into functors table

Author: ScriptRaccoon

databases/catdat/schema/007_functors.sql

@@ -2,9 +2,14 @@ CREATE TABLE functors (
     id TEXT PRIMARY KEY,
     source TEXT NOT NULL,
     target TEXT NOT NULL,
+    left_adjoint TEXT,
+    UNIQUE (id, source, target),
+    FOREIGN KEY (id)  REFERENCES structures (id) ON DELETE CASCADE,
     FOREIGN KEY (source) REFERENCES categories (id) ON DELETE CASCADE,
     FOREIGN KEY (target) REFERENCES categories (id) ON DELETE CASCADE,
-    FOREIGN KEY (id)  REFERENCES structures (id) ON DELETE CASCADE
+    FOREIGN KEY (left_adjoint, target, source)
+        REFERENCES functors (id, source, target)
+        ON DELETE CASCADE
 );
 
 CREATE TRIGGER trg_functor_type_check

databases/catdat/schema/008_adjoint-functors.sql

@@ -68,7 +68,6 @@ function clear_all_tables() {
 
 		db.prepare(`DELETE FROM source_assumptions`).run()
 		db.prepare(`DELETE FROM target_assumptions`).run()
-		db.prepare(`DELETE FROM adjoint_functors`).run()
 
 		db.prepare(`DELETE FROM assumptions`).run()
 		db.prepare(`DELETE FROM conclusions`).run()
@@ -279,20 +278,16 @@ function insert_category(category: CategoryYaml) {
  */
 function insert_functor(functor: FunctorYaml) {
 	const functor_insert = db.prepare(
-		`INSERT INTO functors (id, source, target) VALUES (?, ?, ?)`,
+		`INSERT INTO functors (id, source, target, left_adjoint)
+		VALUES (?, ?, ?, ?)`,
 	)
 
-	const adjoint_insert = db.prepare(
-		`INSERT INTO adjoint_functors (left_adjoint, right_adjoint)
-		VALUES (?, ?)
-		ON CONFLICT (left_adjoint, right_adjoint) DO NOTHING`,
+	functor_insert.run(
+		functor.id,
+		functor.source,
+		functor.target,
+		functor.left_adjoint || null,
 	)
-
-	functor_insert.run(functor.id, functor.source, functor.target)
-
-	if (functor.left_adjoint) {
-		adjoint_insert.run(functor.left_adjoint, functor.id)
-	}
 }
 
 /**

…bases/catdat/schema/009_implications.sql …bases/catdat/schema/008_implications.sqldatabases/catdat/schema/009_implications.sql renamed to databases/catdat/schema/008_implications.sql databases/catdat/schema/009_implications.sql renamed to databases/catdat/schema/008_implications.sql

@@ -31,11 +31,17 @@ export type CategorySpecificDisplay = {
 
 export type FunctorSpecificDisplay = {
 	source: string
-	target: string
 	source_name: string
-	target_name: string
 	source_notation: string
+	target: string
+	target_name: string
 	target_notation: string
+	left_adjoint: string | null
+	left_adjoint_name: string | null
+	left_adjoint_notation: string | null
+	right_adjoint: string | null
+	right_adjoint_name: string | null
+	right_adjoint_notation: string | null
 }
 
 export type TagObject = { tag: string }

databases/catdat/scripts/seed.ts

@@ -1,5 +1,5 @@
-import type { FunctorSpecificDisplay, RelatedStructure } from '$lib/commons/types'
-import { batch } from '$lib/server/db.catdat'
+import type { FunctorSpecificDisplay } from '$lib/commons/types'
+import { query } from '$lib/server/db.catdat'
 import { fetch_structure } from '$lib/server/fetchers/structure'
 import { render_nested_formulas } from '$lib/server/formulas'
 import { error } from '@sveltejs/kit'
@@ -20,9 +20,7 @@ export const load = (event) => {
 		comments,
 	} = fetch_structure('functor', id)
 
-	const { results, err } = batch<
-		[FunctorSpecificDisplay, RelatedStructure, RelatedStructure]
-	>([
+	const { rows: functors, err } = query<FunctorSpecificDisplay>(
 		// specific information for the functor
 		sql`
             SELECT
@@ -31,39 +29,28 @@ export const load = (event) => {
                 source.name AS source_name,
 				source.notation AS source_notation,
 				target.name AS target_name,
-				target.notation AS target_notation
+				target.notation AS target_notation,
+				la.id AS left_adjoint,
+				la.name AS left_adjoint_name,
+				la.notation AS left_adjoint_notation,
+				ra.id AS right_adjoint,
+				ra.name AS right_adjoint_name,
+				ra.notation AS right_adjoint_notation
             FROM functors f
             INNER JOIN structures AS source ON source.id = f.source
             INNER JOIN structures AS target ON target.id = f.target
+			LEFT JOIN structures AS la ON la.id = f.left_adjoint
+			LEFT JOIN functors AS rf ON rf.left_adjoint = f.id
+			LEFT JOIN structures AS ra ON ra.id = rf.id
             WHERE f.id = ${id}
         `,
-		// left adjoint functor
-		sql`
-			SELECT f.id, f.name, f.notation
-			FROM adjoint_functors a
-			INNER JOIN structures f ON f.id = a.left_adjoint
-			WHERE a.right_adjoint = ${id}
-		`,
-		// right adjoint functor
-		sql`
-			SELECT f.id, f.name, f.notation
-			FROM adjoint_functors a
-			INNER JOIN structures f ON f.id = a.right_adjoint
-			WHERE a.left_adjoint = ${id}
-		`,
-	])
+	)
 
 	if (err) error(500, 'Could not load functor')
 
-	const [functors, left_adjoints, right_adjoints] = results
-
 	if (!functors.length) error(404, `Could not find functor with ID '${id}'`)
 
-	const functor = {
-		...functors[0],
-		left_adjoint: left_adjoints.at(0),
-		right_adjoint: right_adjoints.at(0),
-	}
+	const functor = functors[0]
 
 	return render_nested_formulas({
 		structure,

src/lib/commons/types.ts

@@ -20,10 +20,10 @@
 			<li>
 				<strong>Left adjoint:</strong>
 				<a
-					href="/functor/{data.functor.left_adjoint.id}"
-					aria-label={data.functor.left_adjoint.name}
+					href="/functor/{data.functor.left_adjoint}"
+					aria-label={data.functor.left_adjoint_name}
 				>
-					{@html data.functor.left_adjoint.notation}
+					{@html data.functor.left_adjoint_notation}
 				</a>
 			</li>
 		{/if}
@@ -32,10 +32,10 @@
 			<li>
 				<strong>Right adjoint:</strong>
 				<a
-					href="/functor/{data.functor.right_adjoint.id}"
-					aria-label={data.functor.right_adjoint.name}
+					href="/functor/{data.functor.right_adjoint}"
+					aria-label={data.functor.right_adjoint_name}
 				>
-					{@html data.functor.right_adjoint.notation}
+					{@html data.functor.right_adjoint_notation}
 				</a>
 			</li>
 		{/if}