Skip to content

Commit 86a1097

Browse files
Export TlsSocketTransport so it can be used in gateway
1 parent 7faa766 commit 86a1097

File tree

5 files changed

+28
-8
lines changed

5 files changed

+28
-8
lines changed

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.37",
3+
"version": "0.0.38",
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/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ export { SQLiteCloudRowset, SQLiteCloudRow } from './rowset'
99
export { SQLiteCloudConnection } from './connection'
1010
export { escapeSqlParameter, prepareSql } from './utilities'
1111
export { WebSocketTransport } from './transport-ws'
12+
export { TlsSocketTransport } from './transport-tls'

src/transport-tls.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -377,9 +377,9 @@ function parseRowsetColumnsMetadata(buffer: Buffer, metadata: SQLCloudRowsetMeta
377377
for (let i = 0; i < metadata.numberOfColumns; i++) metadata.columns[i].table = popForward() as string
378378
for (let i = 0; i < metadata.numberOfColumns; i++) metadata.columns[i].column = popForward() as string // original column name
379379

380-
for (let i = 0; i < metadata.numberOfColumns; i++) metadata.columns[i].notNull = popForward() as boolean
381-
for (let i = 0; i < metadata.numberOfColumns; i++) metadata.columns[i].primaryKey = popForward() as boolean
382-
for (let i = 0; i < metadata.numberOfColumns; i++) metadata.columns[i].autoIncrement = popForward() as boolean
380+
for (let i = 0; i < metadata.numberOfColumns; i++) metadata.columns[i].notNull = popForward() as number
381+
for (let i = 0; i < metadata.numberOfColumns; i++) metadata.columns[i].primaryKey = popForward() as number
382+
for (let i = 0; i < metadata.numberOfColumns; i++) metadata.columns[i].autoIncrement = popForward() as number
383383
}
384384

385385
return buffer

test/connection-tls.test.ts

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,29 @@ describe('connection-tls', () => {
283283
LONG_TIMEOUT
284284
)
285285

286+
it(
287+
'should test chunked rowset via ',
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+
297+
expect(results[0]['key']).toBe('REINDEX')
298+
expect(results[1]['key']).toBe('INDEXED')
299+
expect(results[2]['key']).toBe('INDEX')
300+
expect(results[3]['key']).toBe('DESC')
301+
302+
database.close()
303+
done()
304+
})
305+
},
306+
LONG_TIMEOUT
307+
)
308+
286309
it(
287310
'should test chunked rowset twice',
288311
done => {

test/shared.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,6 @@ export function getTestingConfig(url = TESTING_DATABASE_URL): SQLiteCloudConfig
128128
}
129129
}
130130

131-
testingConfig.sqliteMode = true
132-
133131
// create a unique id for this test run based on current time with
134132
// enough precision to avoid duplicate ids and be human readable
135133
function generateRandomId(length: number): string {
@@ -156,7 +154,6 @@ export function getTestingConfig(url = TESTING_DATABASE_URL): SQLiteCloudConfig
156154

157155
export function getTestingDatabase(callback?: ResultsCallback): Database {
158156
const testingConfig = getTestingConfig()
159-
testingConfig.sqliteMode = true
160157
const database = new Database(testingConfig)
161158
// database.verbose()
162159
database.exec(TESTING_SQL, callback)
@@ -165,7 +162,6 @@ export function getTestingDatabase(callback?: ResultsCallback): Database {
165162

166163
export async function getTestingDatabaseAsync(): Promise<Database> {
167164
const testingConfig = getTestingConfig()
168-
testingConfig.sqliteMode = true
169165
const database = new Database(testingConfig)
170166
// database.verbose()
171167
await database.sql(TESTING_SQL)

0 commit comments

Comments
 (0)