mirror of
https://github.com/BradNut/boredgame
synced 2025-09-08 17:40:22 +00:00
Fix merge conflict on drizzle config.
This commit is contained in:
parent
65e10ed8e1
commit
590dea70b5
1 changed files with 0 additions and 4 deletions
|
|
@ -5,11 +5,7 @@ import { defineConfig } from 'drizzle-kit'
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
dialect: 'postgresql',
|
dialect: 'postgresql',
|
||||||
out: './src/lib/server/api/databases/migrations',
|
out: './src/lib/server/api/databases/migrations',
|
||||||
<<<<<<< HEAD
|
|
||||||
schema: './src/lib/server/api/databases/tables/*.table.ts',
|
|
||||||
=======
|
|
||||||
schema: './src/lib/server/api/databases/tables/index.ts',
|
schema: './src/lib/server/api/databases/tables/index.ts',
|
||||||
>>>>>>> 5849219833a6b9a99ec24a960962c4c537e93748
|
|
||||||
dbCredentials: {
|
dbCredentials: {
|
||||||
host: env.DATABASE_HOST || 'localhost',
|
host: env.DATABASE_HOST || 'localhost',
|
||||||
port: Number(env.DATABASE_PORT) || 5432,
|
port: Number(env.DATABASE_PORT) || 5432,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue