Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(starters): improve drizzle integration #7288

Merged
merged 8 commits into from
Jan 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/forty-bats-rule.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@builder.io/qwik': patch
---

updated drizzle to latest version
9 changes: 5 additions & 4 deletions starters/features/drizzle/drizzle.config.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import type { Config } from "drizzle-kit";
export default {
import { defineConfig } from "drizzle-kit";

export default defineConfig({
dialect: "sqlite",
schema: "./drizzle/schema.ts",
out: "./drizzle/migrations/",
driver: "better-sqlite",
dbCredentials: {
url: "./drizzle/db/db.sqlite",
},
} satisfies Config;
});
24 changes: 6 additions & 18 deletions starters/features/drizzle/drizzle/schema.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,10 @@
// // This is your drizzle schema file.
import { sqliteTable as table } from "drizzle-orm/sqlite-core";
import * as t from "drizzle-orm/sqlite-core";

// import { pgTable, serial, text, timestamp } from "drizzle-orm/pg-core";

// export const users = pgTable("users", {
// id: serial("id").primaryKey(),
// name: text("name").default("not_provided"),
// email: text("email").notNull(),
// });

// export const schema = {
// users,
// };
import { sqliteTable, integer, text } from "drizzle-orm/sqlite-core";

export const users = sqliteTable("users", {
id: integer("id", { mode: "number" }).primaryKey({ autoIncrement: true }),
name: text("name").default("not_provided"),
email: text("email").notNull(),
export const users = table("users", {
id: t.int({ mode: "number" }).primaryKey({ autoIncrement: true }),
name: t.text().default("not_provided"),
email: t.text().notNull(),
});

export const schema = {
Expand Down
25 changes: 14 additions & 11 deletions starters/features/drizzle/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
"priority": -10,
"viteConfig": {},
"docs": [
"https://qwik.dev/integrations/integration/drizzle/",
"https://qwik.dev/integrations/drizzle/",
"https://orm.drizzle.team/docs/overview"
],
"nextSteps": {
"title": "Next Steps",
"lines": [
" Drizzle was installed with a simple DB schema and some demo routes,",
" now you need to run `npm run drizzle:migrate` to setup the database.",
"",
" better-sqlite3 was configured by default, but in production",
" you'll want to use Postgres or MySQL.",
Expand All @@ -26,17 +27,19 @@
"alwaysInRoot": []
},
"devDependencies": {
"@types/better-sqlite3": "^7.6.9",
"drizzle-kit": "^0.20.14"
},
"dependencies": {
"better-sqlite3": "^9.4.3",
"drizzle-orm": "^0.29.4"
"@types/better-sqlite3": "^7.6.12",
"drizzle-kit": "^0.30.3",
"better-sqlite3": "^11.8.1",
"drizzle-orm": "^0.39.0"
},
"scripts": {
"postinstall": "drizzle-kit generate:sqlite",
"drizzle:generate": "drizzle-kit generate:sqlite",
"drizzle:migrate": "drizzle-kit push:sqlite",
"drizzle:studio": "drizzle-kit studio --host 127.0.0.1"
"drizzle:generate": "drizzle-kit generate",
"drizzle:migrate": "drizzle-kit migrate",
"drizzle:push": "drizzle-kit push",
"drizzle:pull": "drizzle-kit pull",
"drizzle:check": "drizzle-kit check",
"drizzle:up": "drizzle-kit up",
"drizzle:studio": "drizzle-kit studio",
"postinstall": "drizzle-kit generate"
}
}