fix(unicode): count bytes not characters

Author: Daniele Briggi

bun.lockb

@@ -1,6 +1,6 @@
 {
   "name": "@sqlitecloud/drivers",
-  "version": "1.0.354",
+  "version": "1.0.399",
   "description": "SQLiteCloud drivers for Typescript/Javascript in edge, web and node clients",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",

package.json

@@ -346,7 +346,7 @@ export function formatCommand(command: SQLiteCloudCommand): string {
   return serializeData(command.query, false)
 }
 
-function serializeCommand(data: any[], zeroString: boolean = false): string {
+function serializeCommand(data: SQLiteCloudDataTypes[], zeroString: boolean = false): string {
   const n = data.length
   let serializedData = `${n} `
 
@@ -356,11 +356,12 @@ function serializeCommand(data: any[], zeroString: boolean = false): string {
     serializedData += serializeData(data[i], zs)
   }
 
-  const header = `${CMD_ARRAY}${serializedData.length} `
+  const bytesTotal = Buffer.byteLength(serializedData, 'utf-8')
+  const header = `${CMD_ARRAY}${bytesTotal} `
   return header + serializedData
 }
 
-function serializeData(data: any, zeroString: boolean = false): string {
+function serializeData(data: SQLiteCloudDataTypes, zeroString: boolean = false): string {
   if (typeof data === 'string') {
     let cmd = CMD_STRING
     if (zeroString) {

src/drivers/protocol.ts

@@ -515,28 +515,55 @@ describe('Database.sql (async)', () => {
   })
 
   it('should throw exception when using table name as binding', async () => {
-    const database = await getTestingDatabaseAsync()
-    const table = 'people'
-    await expect(database.sql`SELECT * FROM ${table}`).rejects.toThrow('near "?": syntax error')
+    let database
+    try {
+      database = await getTestingDatabaseAsync()
+      const table = 'people'
+      await expect(database.sql`SELECT * FROM ${table}`).rejects.toThrow('near "?": syntax error')
+    } finally {
+      await removeDatabaseAsync(database)
+    }
   })
 
-  it('should built in commands accept bindings', async () => {
-    const database = await getTestingDatabaseAsync()
+  it('should commands accept bindings', async () => {
+    let database
+    try {
+      database = await getTestingDatabaseAsync()
 
-    const databaseName = database.getConfiguration().database || ''
-    await expect(database.sql`USE DATABASE ${databaseName}`).resolves.toBe('OK')
+      const databaseName = database.getConfiguration().database || ''
+      await expect(database.sql`USE DATABASE ${databaseName}`).resolves.toBe('OK')
 
-    const databaseNameInjectSQL = `${databaseName}; SELECT * FROM people`
-    await expect(database.sql`USE DATABASE ${databaseNameInjectSQL}`).rejects.toThrow(`Database name contains invalid characters (${databaseNameInjectSQL}).`)
+      const databaseNameInjectSQL = `${databaseName}; SELECT * FROM people`
+      await expect(database.sql`USE DATABASE ${databaseNameInjectSQL}`).rejects.toThrow(`Database name contains invalid characters (${databaseNameInjectSQL}).`)
 
-    let key = 'logo_level'
-    let value = 'debug'
-    await expect(database.sql`SET KEY ${key} TO ${value}`).resolves.toBe('OK')
+      let key = 'logo_level'
+      let value = 'debug'
+      await expect(database.sql`SET KEY ${key} TO ${value}`).resolves.toBe('OK')
 
-    key = 'logo_level'
-    value = 'debug; DROP TABLE people'
-    await expect(database.sql`SET KEY ${key} TO ${value}`).resolves.toBe('OK')
-    const result = await database.sql`SELECT * FROM people`
-    expect(result.length).toBeGreaterThan(0)
+      key = 'logo_level'
+      value = 'debug; DROP TABLE people'
+      await expect(database.sql`SET KEY ${key} TO ${value}`).resolves.toBe('OK')
+      const result = await database.sql`SELECT * FROM people`
+      expect(result.length).toBeGreaterThan(0)
+    } finally {
+      await removeDatabaseAsync(database)
+    }
+  })
+
+  it('binding should work with unicode character', async () => {
+    let database
+    try {
+      database = await getTestingDatabaseAsync()
+      const name = 'unicorn-🦄'
+
+      let results = await database.sql('INSERT INTO people (name, age, hobby) VALUES (?, 11, "");', name)
+      expect(results.changes).toEqual(1)
+
+      results = await database.sql('SELECT * FROM people WHERE name = ?;', name)
+      expect(results).toHaveLength(1)
+      expect(results[0].name).toEqual(name)
+    } finally {
+      await removeDatabaseAsync(database)
+    }
   })
 })

test/database.test.ts

@@ -25,9 +25,9 @@ export const WARN_SPEED_MS = 500
 export const EXPECT_SPEED_MS = 6 * 1000
 
 /** Number of times or size of stress (when repeated in sequence) */
-export const SEQUENCE_TEST_SIZE = 150
+export const SEQUENCE_TEST_SIZE = 90
 /** Concurrency size for multiple connection tests */
-export const SIMULTANEOUS_TEST_SIZE = 150
+export const SIMULTANEOUS_TEST_SIZE = 90
 
 /** Testing database from .env file */
 export const CHINOOK_DATABASE_URL = process.env.CHINOOK_DATABASE_URL as string