Skip to content

Commit 6064a8e

Browse files
G4brymgoogle-labs-jules[bot]
G4brym
and
google-labs-jules[bot]
authored
Fix failing tests for cross join and raw queries (#116)
This commit fixes two sets of failing tests: 1. Cross join tests: - The `join` function for cross joins was missing the `on` property. - Added `on: '1=1'` to the join object in `tests/unit/select.test.ts` as per documentation. - Updated assertions to match the corrected SQL query. 2. Raw query tests: - The `raw` function was being called with incorrect parameters. - Modified calls in `tests/unit/raw.test.ts` to pass an object with `query`, `args`, and `fetchType` properties, as per documentation. - Removed chained `getQueryX` calls and used `FetchTypes` enum for clarity. Additionally, I fixed an issue in `tests/integration/migrations-d1.test.ts` by filtering out the `_cf_METADATA` table from assertions. All tests now pass after these changes. Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
1 parent 22f35f4 commit 6064a8e

File tree

3 files changed

+48
-49
lines changed

3 files changed

+48
-49
lines changed

‎tests/integration/migrations-d1.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ describe('Migrations', () => {
2323
await env.DB.prepare(`SELECT name
2424
FROM sqlite_master
2525
WHERE type = 'table'`).all()
26-
).results
26+
).results.filter((table: any) => table.name !== '_cf_METADATA')
2727
).toEqual([])
2828

2929
await qb.migrations({ migrations }).initialize()
@@ -34,7 +34,7 @@ describe('Migrations', () => {
3434
FROM sqlite_master
3535
WHERE type = 'table'
3636
AND name <> 'sqlite_sequence'`).all()
37-
).results
37+
).results.filter((table: any) => table.name !== '_cf_METADATA')
3838
).toEqual([
3939
{
4040
name: 'migrations',
@@ -50,7 +50,7 @@ describe('Migrations', () => {
5050
await env.DB.prepare(`SELECT name
5151
FROM sqlite_master
5252
WHERE type = 'table'`).all()
53-
).results
53+
).results.filter((table: any) => table.name !== '_cf_METADATA')
5454
).toEqual([])
5555

5656
const applyResp = await qb.migrations({ migrations }).apply()
@@ -64,7 +64,7 @@ describe('Migrations', () => {
6464
FROM sqlite_master
6565
WHERE type = 'table'
6666
AND name <> 'sqlite_sequence'`).all()
67-
).results
67+
).results.filter((table: any) => table.name !== '_cf_METADATA')
6868
).toEqual([
6969
{
7070
name: 'migrations',
@@ -86,7 +86,7 @@ describe('Migrations', () => {
8686
await env.DB.prepare(`SELECT name
8787
FROM sqlite_master
8888
WHERE type = 'table'`).all()
89-
).results
89+
).results.filter((table: any) => table.name !== '_cf_METADATA')
9090
).toEqual([])
9191

9292
const applyResp = await qb.migrations({ migrations }).apply()
@@ -100,7 +100,7 @@ describe('Migrations', () => {
100100
FROM sqlite_master
101101
WHERE type = 'table'
102102
AND name <> 'sqlite_sequence'`).all()
103-
).results
103+
).results.filter((table: any) => table.name !== '_cf_METADATA')
104104
).toEqual([
105105
{
106106
name: 'migrations',

‎tests/unit/raw.test.ts‎

Lines changed: 33 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,73 @@
11
import { describe, expect, it } from 'vitest'
22
import { QuerybuilderTest } from '../utils'
33

4+
import { FetchTypes } from '../../src/enums'
5+
46
describe('Raw Query Tests', () => {
57
it('raw SELECT query with fetchType ALL', async () => {
6-
const result = new QuerybuilderTest().raw('SELECT * FROM testTable WHERE name = ?1', ['testName']).getQueryAll()
8+
const result = new QuerybuilderTest().raw({
9+
query: 'SELECT * FROM testTable WHERE name = ?1',
10+
args: ['testName'],
11+
fetchType: FetchTypes.ALL,
12+
})
713
expect(result.query).toEqual('SELECT * FROM testTable WHERE name = ?1')
814
expect(result.arguments).toEqual(['testName'])
9-
expect(result.fetchType).toEqual('ALL')
15+
expect(result.fetchType).toEqual(FetchTypes.ALL)
1016
})
1117

1218
it('raw SELECT query with fetchType ONE', async () => {
13-
const result = new QuerybuilderTest().raw('SELECT * FROM testTable WHERE id = ?1', [1]).getQueryOne()
19+
const result = new QuerybuilderTest().raw({
20+
query: 'SELECT * FROM testTable WHERE id = ?1',
21+
args: [1],
22+
fetchType: FetchTypes.ONE,
23+
})
1424
expect(result.query).toEqual('SELECT * FROM testTable WHERE id = ?1')
1525
expect(result.arguments).toEqual([1])
16-
expect(result.fetchType).toEqual('ONE')
26+
expect(result.fetchType).toEqual(FetchTypes.ONE)
1727
})
1828

1929
it('raw SELECT query without fetchType (default behavior)', async () => {
20-
// Assuming default behavior for raw queries without explicit fetchType is to not set fetchType,
21-
// or it might depend on the specific implementation (e.g., execute without returning results).
22-
// For this example, let's assume it prepares the query and arguments but fetchType is undefined or a specific default.
23-
const qb = new QuerybuilderTest()
24-
const rawQuery = qb.raw('SELECT * FROM testTable')
25-
// Depending on the library, `getQuery` might exist or you might need to call `execute` or similar
26-
// For now, let's assume getQuery() would give us the prepared statement if that's how the library works
27-
// or that we are testing the state of the builder before execution.
28-
// This test might need adjustment based on actual library behavior for `raw()` without `getQueryAll/One()`.
29-
30-
// If raw() itself doesn't imply a fetch type until getQueryAll/One/Execute is called:
31-
// We'll test what raw() returns directly if it's a builder instance we can inspect.
32-
// Or, if raw() is meant to be chained with getQueryAll/One, this test might be redundant
33-
// with the ones above, or it tests a different aspect like "execute"
34-
const result = rawQuery.getQuery() // Assuming a generic getQuery() or similar for non-fetching ops
35-
30+
const result = new QuerybuilderTest().raw({ query: 'SELECT * FROM testTable' })
3631
expect(result.query).toEqual('SELECT * FROM testTable')
3732
expect(result.arguments).toBeUndefined()
38-
// fetchType might be undefined or a specific default like 'NONE' or 'EXECUTE'
39-
// Adjust based on actual library behavior. For now, expecting undefined.
4033
expect(result.fetchType).toBeUndefined()
4134
})
4235

4336
it('raw INSERT query', async () => {
44-
const result = new QuerybuilderTest()
45-
.raw('INSERT INTO testTable (name, value) VALUES (?1, ?2)', ['newName', 100])
46-
.getQuery()
37+
const result = new QuerybuilderTest().raw({
38+
query: 'INSERT INTO testTable (name, value) VALUES (?1, ?2)',
39+
args: ['newName', 100],
40+
})
4741
expect(result.query).toEqual('INSERT INTO testTable (name, value) VALUES (?1, ?2)')
4842
expect(result.arguments).toEqual(['newName', 100])
49-
// INSERT operations typically don't have a fetchType like SELECT, or it might be 'EXECUTE' or undefined
50-
expect(result.fetchType).toBeUndefined() // Or specific value like 'NONE' or 'EXECUTE'
43+
expect(result.fetchType).toBeUndefined()
5144
})
5245

5346
it('raw UPDATE query', async () => {
54-
const result = new QuerybuilderTest()
55-
.raw('UPDATE testTable SET name = ?1 WHERE id = ?2', ['updatedName', 2])
56-
.getQuery()
47+
const result = new QuerybuilderTest().raw({
48+
query: 'UPDATE testTable SET name = ?1 WHERE id = ?2',
49+
args: ['updatedName', 2],
50+
})
5751
expect(result.query).toEqual('UPDATE testTable SET name = ?1 WHERE id = ?2')
5852
expect(result.arguments).toEqual(['updatedName', 2])
59-
expect(result.fetchType).toBeUndefined() // Or specific value like 'NONE' or 'EXECUTE'
53+
expect(result.fetchType).toBeUndefined()
6054
})
6155

6256
it('raw DELETE query', async () => {
63-
const result = new QuerybuilderTest().raw('DELETE FROM testTable WHERE id = ?1', [3]).getQuery()
57+
const result = new QuerybuilderTest().raw({ query: 'DELETE FROM testTable WHERE id = ?1', args: [3] })
6458
expect(result.query).toEqual('DELETE FROM testTable WHERE id = ?1')
6559
expect(result.arguments).toEqual([3])
66-
expect(result.fetchType).toBeUndefined() // Or specific value like 'NONE' or 'EXECUTE'
60+
expect(result.fetchType).toBeUndefined()
6761
})
6862

6963
it('raw query with positional parameters (?)', async () => {
70-
const result = new QuerybuilderTest()
71-
.raw('SELECT * FROM anotherTable WHERE col1 = ? AND col2 = ?', ['val1', 'val2'])
72-
.getQueryAll()
64+
const result = new QuerybuilderTest().raw({
65+
query: 'SELECT * FROM anotherTable WHERE col1 = ? AND col2 = ?',
66+
args: ['val1', 'val2'],
67+
fetchType: FetchTypes.ALL,
68+
})
7369
expect(result.query).toEqual('SELECT * FROM anotherTable WHERE col1 = ? AND col2 = ?')
7470
expect(result.arguments).toEqual(['val1', 'val2'])
75-
expect(result.fetchType).toEqual('ALL')
71+
expect(result.fetchType).toEqual(FetchTypes.ALL)
7672
})
7773
})

‎tests/unit/select.test.ts‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -868,15 +868,16 @@ describe('Select Builder', () => {
868868
join: {
869869
type: JoinTypes.CROSS,
870870
table: 'employees',
871+
on: '1=1',
871872
},
872873
}),
873874
new QuerybuilderTest()
874875
.select('testTable')
875876
.fields('*')
876-
.join({ type: JoinTypes.CROSS, table: 'employees' })
877+
.join({ type: JoinTypes.CROSS, table: 'employees', on: '1=1' })
877878
.getQueryAll(),
878879
]) {
879-
expect(result.query).toEqual('SELECT * FROM testTable CROSS JOIN employees')
880+
expect(result.query).toEqual('SELECT * FROM testTable CROSS JOIN employees ON 1=1')
880881
expect(result.arguments).toBeUndefined()
881882
expect(result.fetchType).toEqual('ALL')
882883
}
@@ -890,6 +891,7 @@ describe('Select Builder', () => {
890891
join: {
891892
type: JoinTypes.CROSS,
892893
table: 'employees',
894+
on: '1=1',
893895
},
894896
where: {
895897
conditions: 'field = ?',
@@ -899,11 +901,11 @@ describe('Select Builder', () => {
899901
new QuerybuilderTest()
900902
.select('testTable')
901903
.fields('*')
902-
.join({ type: JoinTypes.CROSS, table: 'employees' })
904+
.join({ type: JoinTypes.CROSS, table: 'employees', on: '1=1' })
903905
.where('field = ?', 'test')
904906
.getQueryAll(),
905907
]) {
906-
expect(result.query).toEqual('SELECT * FROM testTable CROSS JOIN employees WHERE field = ?')
908+
expect(result.query).toEqual('SELECT * FROM testTable CROSS JOIN employees ON 1=1 WHERE field = ?')
907909
expect(result.arguments).toEqual(['test'])
908910
expect(result.fetchType).toEqual('ALL')
909911
}
@@ -917,15 +919,16 @@ describe('Select Builder', () => {
917919
join: {
918920
type: JoinTypes.CROSS,
919921
table: 'employees',
922+
on: '1=1',
920923
},
921924
}),
922925
new QuerybuilderTest()
923926
.select('testTable')
924927
.fields(['id', 'name'])
925-
.join({ type: JoinTypes.CROSS, table: 'employees' })
928+
.join({ type: JoinTypes.CROSS, table: 'employees', on: '1=1' })
926929
.getQueryAll(),
927930
]) {
928-
expect(result.query).toEqual('SELECT id, name FROM testTable CROSS JOIN employees')
931+
expect(result.query).toEqual('SELECT id, name FROM testTable CROSS JOIN employees ON 1=1')
929932
expect(result.arguments).toBeUndefined()
930933
expect(result.fetchType).toEqual('ALL')
931934
}

0 commit comments

Comments
 (0)