fix(db): validate column type before column schema (#10409)

* fix(db): validate column type before column schema

* add changeset

* Add test for text foreign keys

---------

Co-authored-by: Matthew Phillips <matthew@skypack.dev>

.changeset/happy-tools-grab.md

@@ -0,0 +1,5 @@
+---
+"@astrojs/db": patch
+---
+
+Fixes an issue where one table schema could not reference text fields of another table schema.

packages/db/src/core/schemas.ts

@@ -145,7 +145,7 @@ export const jsonColumnSchema = z.object({
 	}),
 });
 
-export const columnSchema = z.union([
+export const columnSchema = z.discriminatedUnion("type", [
 	booleanColumnSchema,
 	numberColumnSchema,
 	textColumnSchema,

packages/db/test/basics.test.js

@@ -64,5 +64,13 @@ describe('astro:db', () => {
 			const themeDark = $($('.themes-list .theme-dark')[0]).text();
 			expect(themeDark).to.equal('dark mode');
 		});
+
+		it('text fields an be used as references', async () => {
+			const html = await fixture.fetch('/login').then((res) => res.text());
+			const $ = cheerioLoad(html);
+
+			expect($('.session-id').text()).to.equal('12345');
+			expect($('.username').text()).to.equal('Mario');
+		});
 	});
 });

packages/db/test/fixtures/basics/astro.config.ts

@@ -4,4 +4,7 @@ import { defineConfig } from 'astro/config';
 // https://astro.build/config
 export default defineConfig({
 	integrations: [db()],
+	devToolbar: {
+		enabled: false,
+	}
 });

packages/db/test/fixtures/basics/db/config.ts

@@ -8,6 +8,22 @@ const Author = defineTable({
 	},
 });
 
+const User = defineTable({
+	columns: {
+			id: column.text({ primaryKey: true, optional: false }),
+			username: column.text({ optional: false, unique: true }),
+			password: column.text({ optional: false }),
+	},
+});
+
+const Session = defineTable({
+	columns: {
+			id: column.text({ primaryKey: true, optional: false }),
+			expiresAt: column.number({ optional: false, name: "expires_at" }),
+			userId: column.text({ optional: false, references: () => User.columns.id, name: "user_id" }),
+	},
+});
+
 export default defineDb({
-	tables: { Author, Themes },
+	tables: { Author, Themes, User, Session },
 });

packages/db/test/fixtures/basics/db/seed.ts

@@ -1,6 +1,6 @@
 import { asDrizzleTable } from '@astrojs/db/utils';
 import { Themes as ThemesConfig } from './theme';
-import { Author, db } from 'astro:db';
+import { Author, User, Session, db } from 'astro:db';
 
 const Themes = asDrizzleTable('Themes', ThemesConfig);
 export default async function () {
@@ -18,5 +18,15 @@ export default async function () {
 				{ name: 'Bjorn' },
 				{ name: 'Sarah' },
 			]),
+		db
+			.insert(User)
+			.values([
+				{ id: 'mario', username: 'Mario', password: 'itsame' }
+			]),
+		db
+			.insert(Session)
+			.values([
+				{ id: '12345', expiresAt: new Date().valueOf(), userId: 'mario' }
+			]),
 	]);
 }

packages/db/test/fixtures/basics/src/pages/login.astro

@@ -0,0 +1,18 @@
+---
+import { db, Session, User, eq } from 'astro:db';
+
+const users = await db.select().from(User);
+const sessions = await db.select()
+  .from(Session)
+  .innerJoin(User, eq(Session.userId, User.id));
+---
+
+<h2>Sessions</h2>
+<ul class="sessions-list">
+	{sessions.map(({ Session, User }) => (
+		<li>
+			<div class="session-id">{Session.id}</div>
+			<div class="username">{User.username}</div>
+		</li>
+	))}
+</ul>