Skip to content

Commit 85aa460

Browse files
Updated chunked rowset test
1 parent 40d4759 commit 85aa460

File tree

7 files changed

+51
-11
lines changed

7 files changed

+51
-11
lines changed

examples/with-javascript-express/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
"dotenv": "^16.3.1",
1111
"express": "^4.18.2",
1212
"http-errors": "^2.0.0",
13-
"sqlitecloud-js": "^0.0.25"
13+
"@sqlitecloud/drivers": "*"
1414
}
1515
}

examples/with-typescript-knex/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"dependencies": {
99
"knex": "^3.1.0",
10-
"sqlitecloud-js": "^0.0.25"
10+
"@sqlitecloud/drivers": "*"
1111
},
1212
"devDependencies": {
1313
"@types/node": "^20",

examples/with-typescript-nextjs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"next": "14.0.3",
1010
"react": "^18",
1111
"react-dom": "^18",
12-
"sqlitecloud-js": "^0.0.20-beta"
12+
"@sqlitecloud/drivers": "*"
1313
},
1414
"devDependencies": {
1515
"@types/node": "^20",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sqlitecloud/drivers",
3-
"version": "0.0.35",
3+
"version": "0.0.37",
44
"description": "SQLiteCloud drivers for Typescript/Javascript in edge, web and node clients",
55
"main": "./lib/index.js",
66
"types": "./lib/index.d.ts",

src/transport-tls.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,6 @@ function parseRowsetColumnsMetadata(buffer: Buffer, metadata: SQLCloudRowsetMeta
380380
for (let i = 0; i < metadata.numberOfColumns; i++) metadata.columns[i].notNull = popForward() as boolean
381381
for (let i = 0; i < metadata.numberOfColumns; i++) metadata.columns[i].primaryKey = popForward() as boolean
382382
for (let i = 0; i < metadata.numberOfColumns; i++) metadata.columns[i].autoIncrement = popForward() as boolean
383-
console.debug('metadata', metadata)
384383
}
385384

386385
return buffer

src/types.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ export interface SQLCloudRowsetMetadata {
7777
table?: string
7878
/** Original name of the column */
7979
column?: string
80-
/** Column is not nullable? */
81-
notNull?: boolean
82-
/** Column is primary key */
83-
primaryKey?: boolean
84-
/** Column has autoincrement flag */
85-
autoIncrement?: boolean
80+
/** Column is not nullable? 1 */
81+
notNull?: number
82+
/** Column is primary key? 1 */
83+
primaryKey?: number
84+
/** Column has autoincrement flag? 1 */
85+
autoIncrement?: number
8686
}[]
8787
}
8888

test/connection-tls.test.ts

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,12 +271,53 @@ describe('connection-tls', () => {
271271
expect(results.numberOfColumns).toBe(1)
272272
expect(results.columnsNames).toEqual(['key'])
273273

274+
expect(results[0]['key']).toBe('REINDEX')
275+
expect(results[1]['key']).toBe('INDEXED')
276+
expect(results[2]['key']).toBe('INDEX')
277+
expect(results[3]['key']).toBe('DESC')
278+
274279
database.close()
275280
done()
276281
})
277282
},
278283
LONG_TIMEOUT
279284
)
285+
286+
it(
287+
'should test chunked rowset twice',
288+
done => {
289+
// this operation sends 150 packets, so we need to increase the timeout
290+
const database = getChinookTlsConnection(undefined, { timeout: 60 * 1000 })
291+
database.sendCommands('TEST ROWSET_CHUNK', (error, results) => {
292+
expect(error).toBeNull()
293+
expect(results.numberOfRows).toBe(147)
294+
expect(results.numberOfColumns).toBe(1)
295+
expect(results.columnsNames).toEqual(['key'])
296+
expect(results[0]['key']).toBe('REINDEX')
297+
expect(results[1]['key']).toBe('INDEXED')
298+
expect(results[2]['key']).toBe('INDEX')
299+
expect(results[3]['key']).toBe('DESC')
300+
301+
database.sendCommands('TEST ROWSET_CHUNK', (error, results) => {
302+
expect(error).toBeNull()
303+
expect(results.numberOfRows).toBe(147)
304+
expect(results.numberOfColumns).toBe(1)
305+
expect(results.columnsNames).toEqual(['key'])
306+
expect(results[0]['key']).toBe('REINDEX')
307+
expect(results[1]['key']).toBe('INDEXED')
308+
expect(results[2]['key']).toBe('INDEX')
309+
expect(results[3]['key']).toBe('DESC')
310+
311+
database.sendCommands('SELECT 1', (error, results) => {
312+
expect(error).toBeNull()
313+
expect(results.numberOfRows).toBe(1)
314+
done()
315+
})
316+
})
317+
})
318+
},
319+
LONG_TIMEOUT
320+
)
280321
})
281322

282323
describe('operations', () => {

0 commit comments

Comments
 (0)