Fixed DB
This commit is contained in:
@@ -1,10 +1,11 @@
|
|||||||
import { drizzle } from "drizzle-orm/node-postgres"
|
import { drizzle } from "drizzle-orm/node-postgres"
|
||||||
import { Pool } from "pg"
|
import { Pool } from "pg"
|
||||||
import {secrets} from "../src/utils/secrets";
|
import {secrets} from "../src/utils/secrets";
|
||||||
|
import * as schema from "./schema"
|
||||||
|
|
||||||
const pool = new Pool({
|
const pool = new Pool({
|
||||||
connectionString: secrets.DATABASE_URL,
|
connectionString: secrets.DATABASE_URL,
|
||||||
max: 10, // je nach Last
|
max: 10, // je nach Last
|
||||||
})
|
})
|
||||||
|
|
||||||
export const db = drizzle(pool)
|
export const db = drizzle(pool , {schema})
|
||||||
@@ -6,6 +6,6 @@ export default defineConfig({
|
|||||||
schema: "./db/schema",
|
schema: "./db/schema",
|
||||||
out: "./db/migrations",
|
out: "./db/migrations",
|
||||||
dbCredentials: {
|
dbCredentials: {
|
||||||
url: secrets.DATABASE_URL || process.env.DATABASE_URL,
|
url: secrets.DATABASE_URL,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
@@ -146,6 +146,7 @@ async function main() {
|
|||||||
|
|
||||||
app.ready(async () => {
|
app.ready(async () => {
|
||||||
try {
|
try {
|
||||||
|
console.log("Testing DB Connection:")
|
||||||
const result = await app.db.execute("SELECT NOW()");
|
const result = await app.db.execute("SELECT NOW()");
|
||||||
console.log("✓ DB connection OK: " + JSON.stringify(result.rows[0]));
|
console.log("✓ DB connection OK: " + JSON.stringify(result.rows[0]));
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
|||||||
@@ -1,21 +1,9 @@
|
|||||||
import fp from "fastify-plugin"
|
import fp from "fastify-plugin"
|
||||||
import {drizzle, NodePgDatabase} from "drizzle-orm/node-postgres"
|
import {drizzle, NodePgDatabase} from "drizzle-orm/node-postgres"
|
||||||
import { Pool } from "pg"
|
import { Pool } from "pg"
|
||||||
import * as schema from "../../db/schema"
|
import { db } from "../../db"
|
||||||
|
|
||||||
export default fp(async (server, opts) => {
|
export default fp(async (server, opts) => {
|
||||||
const pool = new Pool({
|
|
||||||
host: "10.10.20.10",
|
|
||||||
port: Number(process.env.DB_PORT || 5432),
|
|
||||||
user: "postgres",
|
|
||||||
password: "wJw7aNpEBJdcxgoct6GXNpvY4Cn6ECqu",
|
|
||||||
database: "fedeo",
|
|
||||||
ssl: process.env.DB_DISABLE_SSL === "true" ? false : undefined,
|
|
||||||
})
|
|
||||||
|
|
||||||
// Drizzle instance
|
|
||||||
const db = drizzle(pool, { schema })
|
|
||||||
|
|
||||||
// Dekorieren -> überall server.db
|
// Dekorieren -> überall server.db
|
||||||
server.decorate("db", db)
|
server.decorate("db", db)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user