jsql-neo 4.0.1 → 4.0.2

package/lib/native_client.js

@@ -11,9 +11,16 @@ function encodeBatch(rows) {
   if (rows.length === 0) return new Uint8Array(0);
   const fieldNames = Object.keys(rows[0]);
   const nFields = fieldNames.length;
-  const est = 100 + rows.length * 120;
-  const buf = Buffer.allocUnsafe(est);
+  const est = 100 + rows.length * 160;
+  let buf = Buffer.allocUnsafe(est);
   let off = 0;
+  const ensure = (n) => {
+    if (off + n > buf.length) {
+      const nb = Buffer.allocUnsafe(Math.max(buf.length * 2, off + n));
+      buf.copy(nb, 0, 0, off);
+      buf = nb;
+    }
+  };
 
   off = buf.writeUInt8(nFields, off);
   for (let fi = 0; fi < nFields; fi++) {
@@ -34,8 +41,9 @@ function encodeBatch(rows) {
         if (Number.isInteger(v)) { if (v >= -2147483648 && v <= 2147483647) { off = buf.writeUInt8(INT32_TAG, off); off = buf.writeInt32LE(v, off); } else { off = buf.writeUInt8(INT64_TAG, off); off = buf.writeBigInt64LE(BigInt(v), off); } }
         else { off = buf.writeUInt8(FLOAT_TAG, off); off = buf.writeDoubleLE(v, off); }
       } else if (typeof v === 'string') {
-        off = buf.writeUInt8(STR_TAG, off);
         const sl = Buffer.byteLength(v, 'utf8');
+        ensure(5 + sl);
+        off = buf.writeUInt8(STR_TAG, off);
         off = buf.writeUInt32LE(sl, off);
         off += buf.write(v, off, sl, 'utf8');
       } else { off = buf.writeUInt8(BOOL_TAG, off); off = buf.writeUInt8(v ? 1 : 0, off); }
@@ -47,8 +55,9 @@ function encodeBatch(rows) {
         if (Number.isInteger(v)) { if (v >= -2147483648 && v <= 2147483647) { off = buf.writeUInt8(INT32_TAG, off); off = buf.writeInt32LE(v, off); } else { off = buf.writeUInt8(INT64_TAG, off); off = buf.writeBigInt64LE(BigInt(v), off); } }
         else { off = buf.writeUInt8(FLOAT_TAG, off); off = buf.writeDoubleLE(v, off); }
       } else if (typeof v === 'string') {
-        off = buf.writeUInt8(STR_TAG, off);
         const sl = Buffer.byteLength(v, 'utf8');
+        ensure(5 + sl);
+        off = buf.writeUInt8(STR_TAG, off);
         off = buf.writeUInt32LE(sl, off);
         off += buf.write(v, off, sl, 'utf8');
       } else { off = buf.writeUInt8(BOOL_TAG, off); off = buf.writeUInt8(v ? 1 : 0, off); }
@@ -60,8 +69,9 @@ function encodeBatch(rows) {
         if (Number.isInteger(v)) { if (v >= -2147483648 && v <= 2147483647) { off = buf.writeUInt8(INT32_TAG, off); off = buf.writeInt32LE(v, off); } else { off = buf.writeUInt8(INT64_TAG, off); off = buf.writeBigInt64LE(BigInt(v), off); } }
         else { off = buf.writeUInt8(FLOAT_TAG, off); off = buf.writeDoubleLE(v, off); }
       } else if (typeof v === 'string') {
-        off = buf.writeUInt8(STR_TAG, off);
         const sl = Buffer.byteLength(v, 'utf8');
+        ensure(5 + sl);
+        off = buf.writeUInt8(STR_TAG, off);
         off = buf.writeUInt32LE(sl, off);
         off += buf.write(v, off, sl, 'utf8');
       } else { off = buf.writeUInt8(BOOL_TAG, off); off = buf.writeUInt8(v ? 1 : 0, off); }
@@ -73,8 +83,9 @@ function encodeBatch(rows) {
         if (Number.isInteger(v)) { if (v >= -2147483648 && v <= 2147483647) { off = buf.writeUInt8(INT32_TAG, off); off = buf.writeInt32LE(v, off); } else { off = buf.writeUInt8(INT64_TAG, off); off = buf.writeBigInt64LE(BigInt(v), off); } }
         else { off = buf.writeUInt8(FLOAT_TAG, off); off = buf.writeDoubleLE(v, off); }
       } else if (typeof v === 'string') {
-        off = buf.writeUInt8(STR_TAG, off);
         const sl = Buffer.byteLength(v, 'utf8');
+        ensure(5 + sl);
+        off = buf.writeUInt8(STR_TAG, off);
         off = buf.writeUInt32LE(sl, off);
         off += buf.write(v, off, sl, 'utf8');
       } else { off = buf.writeUInt8(BOOL_TAG, off); off = buf.writeUInt8(v ? 1 : 0, off); }
@@ -86,8 +97,9 @@ function encodeBatch(rows) {
         if (Number.isInteger(v)) { if (v >= -2147483648 && v <= 2147483647) { off = buf.writeUInt8(INT32_TAG, off); off = buf.writeInt32LE(v, off); } else { off = buf.writeUInt8(INT64_TAG, off); off = buf.writeBigInt64LE(BigInt(v), off); } }
         else { off = buf.writeUInt8(FLOAT_TAG, off); off = buf.writeDoubleLE(v, off); }
       } else if (typeof v === 'string') {
-        off = buf.writeUInt8(STR_TAG, off);
         const sl = Buffer.byteLength(v, 'utf8');
+        ensure(5 + sl);
+        off = buf.writeUInt8(STR_TAG, off);
         off = buf.writeUInt32LE(sl, off);
         off += buf.write(v, off, sl, 'utf8');
       } else { off = buf.writeUInt8(BOOL_TAG, off); off = buf.writeUInt8(v ? 1 : 0, off); }
@@ -99,8 +111,9 @@ function encodeBatch(rows) {
         if (Number.isInteger(v)) { if (v >= -2147483648 && v <= 2147483647) { off = buf.writeUInt8(INT32_TAG, off); off = buf.writeInt32LE(v, off); } else { off = buf.writeUInt8(INT64_TAG, off); off = buf.writeBigInt64LE(BigInt(v), off); } }
         else { off = buf.writeUInt8(FLOAT_TAG, off); off = buf.writeDoubleLE(v, off); }
       } else if (typeof v === 'string') {
-        off = buf.writeUInt8(STR_TAG, off);
         const sl = Buffer.byteLength(v, 'utf8');
+        ensure(5 + sl);
+        off = buf.writeUInt8(STR_TAG, off);
         off = buf.writeUInt32LE(sl, off);
         off += buf.write(v, off, sl, 'utf8');
       } else { off = buf.writeUInt8(BOOL_TAG, off); off = buf.writeUInt8(v ? 1 : 0, off); }
@@ -328,16 +341,11 @@ class JSQL {
     if (!this._runHooks('beforeInsert', [table, filtered])) return [];
     if (arr.length > 1) {
       await this._flush();
-      let result;
-      for (let i = 0; i < arr.length; i += this._flushThreshold) {
-        const chunk = arr.slice(i, i + this._flushThreshold);
-        const r = await this._insertBatch(table, chunk);
-        if (r && r.error) throw new Error(r.error);
-        if (!result) result = r;
-      }
-      this._emit('insert', { table, count: arr.length, ids: result });
-      this._runHooks('afterInsert', [table, filtered, result]);
-      return result;
+      const r = await this._insertBatch(table, arr);
+      if (r && r.error) throw new Error(r.error);
+      this._emit('insert', { table, count: arr.length, ids: r });
+      this._runHooks('afterInsert', [table, filtered, r]);
+      return r;
     }
     if (!this._buffer[table]) this._buffer[table] = [];
     this._buffer[table].push(arr[0]);

package/lib/sql.js

@@ -678,7 +678,7 @@ function extractEqualPushdown(expr, schema) {
     if (node.type === 'and') { walk(node.left); walk(node.right); return; }
     if (node.type === 'compare' && node.op === '=') {
       const col = node.left && node.left.type === 'column' ? node.left.name : null;
-      const val = node.right && node.right.type === 'literal' ? node.right.value : undefined;
+      const val = node.right && (node.right.type === 'literal' || node.right.type === 'value' || node.right.type === 'param') ? node.right.value : undefined;
       if (col && val !== undefined && val !== null && schema[col] && !(schema[col].primaryKey && schema[col].autoIncrement === false)) {
         filter[col] = val;
         return;
@@ -728,9 +728,10 @@ function normalizeRow(row, schema) {
     if (schema) {
       const pkCols = Object.keys(schema).filter(k => schema[k].primaryKey);
       for (const c of pkCols) {
-        if ((flat[c] === undefined || flat[c] === null) && row.id !== undefined) flat[c] = row.id;
+        const v = flat[c];
+        if (row.id !== undefined && (v === undefined || v === null || v === 0 || v === '')) flat[c] = row.id;
       }
-    } else if (row.id !== undefined && flat.id === undefined) {
+    } else if (row.id !== undefined && (flat.id === undefined || flat.id === null || flat.id === 0 || flat.id === '')) {
       flat.id = row.id;
     }
     flat._rid = row.id;
@@ -858,6 +859,11 @@ class SQLExecutor {
           if (this.engine.hasTable && !this.engine.hasTable(statement.table)) {
             throw new Error(`Table '${statement.table}' does not exist`);
           }
+          if (statement.aggregate && statement.aggregate.type === 'COUNT' && !statement.where && !statement.distinct) {
+            const aggName = statement.aggregate.alias || 'COUNT(*)';
+            const n = this.engine.count ? await this.engine.count(statement.table) : 0;
+            return { ok: true, type: 'select', table: statement.table, columns: [aggName], rows: [[n]], aggregate: statement.aggregate };
+          }
           schema = this.engine.getTableSchema
             ? await this.engine.getTableSchema(statement.table)
             : (this.engine._schemas ? this.engine._schemas[statement.table] : null);
@@ -905,7 +911,13 @@ class SQLExecutor {
           const rowsOnly = rows;
           const aggName = agg.alias || (agg.type === 'COUNT' ? 'COUNT(*)' : agg.type + '(' + agg.column + ')');
           if (agg.type === 'COUNT') {
-            return { ok: true, type: 'select', table: statement.table, columns: [aggName], rows: [[rowsOnly.length]], aggregate: agg };
+            let n;
+            if (!statement.where && !statement.distinct) {
+              n = this.engine.count ? await this.engine.count(statement.table) : rowsOnly.length;
+            } else {
+              n = rowsOnly.length;
+            }
+            return { ok: true, type: 'select', table: statement.table, columns: [aggName], rows: [[n]], aggregate: agg };
           }
           const values = rowsOnly.map(r => r[agg.column]).filter(v => v !== null && v !== undefined);
           let value;

package/nativesrc/jsql-neo-core/src/engine/table.rs

@@ -235,7 +235,7 @@ impl Table {
 
             if let Some(ref pk_key) = pk_auto_key {
                 match fields.get(pk_key) {
-                    Some(v) if v.is_null() => {
+                    Some(v) if v.is_null() || v.as_i64() == Some(0) => {
                         fields.insert(pk_key.clone(), serde_json::Value::Number(id.into()));
                     }
                     Some(v) => {
@@ -307,7 +307,7 @@ impl Table {
                 if let Some(pi) = pk_idx {
                     if pi < row_vals.len() {
                         match row_vals[pi] {
-                            FieldValue::Null => row_vals[pi] = FieldValue::Int(id as i64),
+                            FieldValue::Null | FieldValue::Int(0) => row_vals[pi] = FieldValue::Int(id as i64),
                             FieldValue::Int(e) if e > 0 => {
                                 self.next_id = self.next_id.max((e + 1) as u64);
                             }
@@ -344,7 +344,13 @@ impl Table {
             for (i, remapped_si) in remap.iter().enumerate() {
                 if let Some(si) = *remapped_si {
                     if si < row_vals.len() {
-                        self.values.push(std::mem::take(&mut row_vals[si]));
+                        let v = std::mem::take(&mut row_vals[si]);
+                        let is_auto_pk = pk_auto_key.is_some() && self.field_order[i] == *pk_auto_key.as_ref().unwrap();
+                        if is_auto_pk && matches!(v, FieldValue::Null | FieldValue::Int(0)) {
+                            self.values.push(FieldValue::Int(id as i64));
+                        } else {
+                            self.values.push(v);
+                        }
                         continue;
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jsql-neo",
-    "version": "4.0.1",
+    "version": "4.0.2",
     "description": "JSQL-NEO — Rust-powered embedded database with WASM, REST API, B-Tree indexes, WAL, crash recovery",
     "main": "index.js",
     "bin": {