Skip to content

fix(db): use libsql in prepare mode with cloudflare preset #798

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.

Sign up for GitHub

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

Closed
onmax wants to merge 1 commit into from
Closed

fix(db): use libsql in prepare mode with cloudflare preset #798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/db/setup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ export async function resolveDatabaseConfig(nuxt: Nuxt, hub: HubConfig): Promise
}
break
}
// Cloudflare D1 (production only - dev uses local libsql)
if (hub.hosting.includes('cloudflare') && !nuxt.options.dev) {
// Cloudflare D1 (production only - dev/prepare uses local libsql)
if (hub.hosting.includes('cloudflare') && !nuxt.options.dev && !nuxt.options._prepare) {
config.driver = 'd1'
break
}
Expand Down
36 changes: 33 additions & 3 deletions test/database.config.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ describe('resolveDatabaseConfig', () => {
process.env = originalEnv
})

const createMockNuxt = (layers: any[] = []) => ({
const createMockNuxt = (layers: any[] = [], opts: { dev?: boolean, _prepare?: boolean } = {}) => ({
options: {
rootDir: '/',
srcDir: '/app/',
dev: opts.dev ?? false,
_prepare: opts._prepare ?? false,
_layers: layers
}
}) as any
Expand Down Expand Up @@ -104,8 +106,8 @@ describe('resolveDatabaseConfig', () => {
})
})

it('should use D1 driver when hosting is cloudflare', async () => {
const nuxt = createMockNuxt()
it('should use D1 driver when hosting is cloudflare (production mode)', async () => {
const nuxt = createMockNuxt([], { dev: false, _prepare: false })
const hub = createBaseHubConfig('sqlite')
hub.hosting = 'cloudflare'

Expand All @@ -118,6 +120,34 @@ describe('resolveDatabaseConfig', () => {
})
})

it('should use libsql when hosting is cloudflare in dev mode', async () => {
const nuxt = createMockNuxt([], { dev: true })
const hub = createBaseHubConfig('sqlite')
hub.hosting = 'cloudflare'

const result = await resolveDatabaseConfig(nuxt, hub)

expect(result).toMatchObject({
dialect: 'sqlite',
driver: 'libsql',
connection: { url: 'file:/tmp/test-hub/db/sqlite.db' }
})
})

it('should use libsql when hosting is cloudflare in prepare mode', async () => {
const nuxt = createMockNuxt([], { dev: false, _prepare: true })
const hub = createBaseHubConfig('sqlite')
hub.hosting = 'cloudflare'

const result = await resolveDatabaseConfig(nuxt, hub)

expect(result).toMatchObject({
dialect: 'sqlite',
driver: 'libsql',
connection: { url: 'file:/tmp/test-hub/db/sqlite.db' }
})
})

it('should preserve custom driver when specified', async () => {
const nuxt = createMockNuxt()
const hub = createBaseHubConfig({
Expand Down
Loading