jsql-neo 4.0.2 → 4.1.0

package/nativesrc/jsql-neo-core/Cargo.lock

@@ -0,0 +1,455 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
+
+[[package]]
+name = "bincode"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
+
+[[package]]
+name = "cc"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5add81bb678e6cb321aff7fa0dc7689ad82b112dbc032cea19f91d6b8e3582b9"
+dependencies = [
+ "find-msvc-tools",
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "chrono"
+version = "0.4.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327"
+dependencies = [
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "windows-link",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "crc32fast"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
+
+[[package]]
+name = "futures-core"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cd50c473c80f6d7c3670a752354b8e569b1a7cbfdc0419ec88e5edad85e0dc7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b231ed28831efb4a61a08580c4bc233ec56bc009f4cd8f52da2c3cb97df0c109"
+
+[[package]]
+name = "futures-util"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a77a90a256fce34da66415271e30f94ee91c57b04b8a2c042d9cf3220179deaa"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "log",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
+
+[[package]]
+name = "js-sys"
+version = "0.3.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102"
+dependencies = [
+ "cfg-if",
+ "futures-util",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "jsql-neo-core"
+version = "0.1.0"
+dependencies = [
+ "bincode",
+ "chrono",
+ "crc32fast",
+ "itoa",
+ "js-sys",
+ "rustc-hash",
+ "ryu",
+ "serde",
+ "serde_json",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.189"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
+
+[[package]]
+name = "log"
+version = "0.4.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
+
+[[package]]
+name = "memchr"
+version = "2.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.107"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rustc-hash"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d"
+
+[[package]]
+name = "rustversion"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
+
+[[package]]
+name = "ryu"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
+
+[[package]]
+name = "serde"
+version = "1.0.229"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.229"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.229"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.3",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.151"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14"
+dependencies = [
+ "indexmap",
+ "itoa",
+ "memchr",
+ "serde",
+ "serde_core",
+ "zmij",
+]
+
+[[package]]
+name = "shlex"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
+
+[[package]]
+name = "slab"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
+
+[[package]]
+name = "syn"
+version = "2.0.119"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "3.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.126"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.126"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.126"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e"
+dependencies = [
+ "bumpalo",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.126"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-link",
+ "windows-result",
+ "windows-strings",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-result"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "zmij"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"

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

@@ -9,7 +9,7 @@ use std::collections::{HashMap, HashSet};
 use std::fs;
 use std::path::{Path, PathBuf};
 
-use crate::engine::{Engine, MemoryEngine, Table};
+use crate::engine::{validate_table_name, Engine, MemoryEngine, Table};
 use crate::types::{FieldSchema, TableDefinition};
 use serde::{Deserialize, Serialize};
 
@@ -60,7 +60,12 @@ impl HybridEngine {
     }
 
     /// 打开磁盘存储目录（mode: 'hybrid' | 'disk' | 'memory'；memory 或空目录忽略）
+    /// 每次 open 重置引擎状态，避免多个库目录/实例间残留表数据
     pub fn open(&mut self, dir: &str, mode: &str) -> Result<(), String> {
+        self.mem.borrow_mut().clear();
+        self.meta.borrow_mut().clear();
+        self.dirty.borrow_mut().clear();
+        self.last_access.borrow_mut().clear();
         if dir.is_empty() || mode == "memory" {
             self.store_dir = None;
             return Ok(());
@@ -180,7 +185,7 @@ impl HybridEngine {
                 f
             }
         };
-        let dir = self.store_dir.as_ref().unwrap();
+        let dir = match &self.store_dir { Some(d) => d, None => return Ok(()) };
         let tmp = dir.join(format!("{}.tmp", file));
         fs::write(&tmp, json).map_err(|e| format!("write {}: {}", tmp.display(), e))?;
         let final_path = self.table_path(name, &file);
@@ -252,19 +257,19 @@ impl HybridEngine {
                 0 => crate::engine::FieldValue::Null,
                 1 => {
                     if *off + 8 > buf.len() { return Err("truncated int".into()); }
-                    let n = i64::from_le_bytes(buf[*off..*off+8].try_into().unwrap());
+                    let n = i64::from_le_bytes([buf[*off], buf[*off+1], buf[*off+2], buf[*off+3], buf[*off+4], buf[*off+5], buf[*off+6], buf[*off+7]]);
                     *off += 8;
                     crate::engine::FieldValue::Int(n)
                 }
                 2 => {
                     if *off + 8 > buf.len() { return Err("truncated float".into()); }
-                    let n = f64::from_le_bytes(buf[*off..*off+8].try_into().unwrap());
+                    let n = f64::from_le_bytes([buf[*off], buf[*off+1], buf[*off+2], buf[*off+3], buf[*off+4], buf[*off+5], buf[*off+6], buf[*off+7]]);
                     *off += 8;
                     crate::engine::FieldValue::Float(n)
                 }
                 3 => {
                     if *off + 4 > buf.len() { return Err("truncated len".into()); }
-                    let len = u32::from_le_bytes(buf[*off..*off+4].try_into().unwrap()) as usize;
+                    let len = u32::from_le_bytes([buf[*off], buf[*off+1], buf[*off+2], buf[*off+3]]) as usize;
                     *off += 4;
                     if *off + len > buf.len() { return Err("truncated str".into()); }
                     let s = std::str::from_utf8(&buf[*off..*off+len]).map_err(|_| "bad utf8")?.to_string();
@@ -278,7 +283,7 @@ impl HybridEngine {
                 }
                 5 => {
                     if *off + 4 > buf.len() { return Err("truncated i32".into()); }
-                    let n = i32::from_le_bytes(buf[*off..*off+4].try_into().unwrap()) as i64;
+                    let n = i32::from_le_bytes([buf[*off], buf[*off+1], buf[*off+2], buf[*off+3]]) as i64;
                     *off += 4;
                     crate::engine::FieldValue::Int(n)
                 }
@@ -306,6 +311,7 @@ impl Default for HybridEngine {
 
 impl Engine for HybridEngine {
     fn create_table(&mut self, def: TableDefinition) -> Result<(), String> {
+        validate_table_name(&def.name)?;
         if self.mem.borrow().tables.contains_key(&def.name) || self.meta.borrow().contains_key(&def.name) {
             return Err(format!("table '{}' already exists", def.name));
         }

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

@@ -1,20 +1,33 @@
 use std::collections::HashMap;
 use crate::engine::table::Table;
-use crate::engine::Engine;
+use crate::engine::{validate_table_name, Engine};
 use crate::types::{Row, TableDefinition};
 
 pub struct MemoryEngine {
     pub tables: HashMap<String, Table>,
+    txs: HashMap<String, HashMap<String, Table>>,
+    next_tx_id: u64,
 }
 
 impl MemoryEngine {
     pub fn new() -> Self {
-        Self { tables: HashMap::new() }
+        Self { tables: HashMap::new(), txs: HashMap::new(), next_tx_id: 1 }
+    }
+
+    pub fn clear(&mut self) {
+        self.tables.clear();
+        self.txs.clear();
+        self.next_tx_id = 1;
+    }
+
+    fn snapshot(&self) -> HashMap<String, Table> {
+        self.tables.iter().map(|(k, v)| (k.clone(), v.clone())).collect()
     }
 }
 
 impl Engine for MemoryEngine {
     fn create_table(&mut self, def: TableDefinition) -> Result<(), String> {
+        validate_table_name(&def.name)?;
         if self.tables.contains_key(&def.name) {
             return Err(format!("table '{}' already exists", def.name));
         }
@@ -134,14 +147,22 @@ impl Engine for MemoryEngine {
     }
 
     fn begin_tx(&mut self) -> Result<String, String> {
-        Err("transactions not supported on MemoryEngine directly".into())
+        let tx_id = format!("tx{}", self.next_tx_id);
+        self.next_tx_id += 1;
+        self.txs.insert(tx_id.clone(), self.snapshot());
+        Ok(tx_id)
     }
 
-    fn commit_tx(&mut self, _tx_id: &str) -> Result<(), String> {
-        Err("transactions not supported on MemoryEngine directly".into())
+    fn commit_tx(&mut self, tx_id: &str) -> Result<(), String> {
+        self.txs.remove(tx_id)
+            .map(|_| ())
+            .ok_or_else(|| format!("transaction '{}' not found", tx_id))
     }
 
-    fn rollback_tx(&mut self, _tx_id: &str) -> Result<(), String> {
-        Err("transactions not supported on MemoryEngine directly".into())
+    fn rollback_tx(&mut self, tx_id: &str) -> Result<(), String> {
+        let snap = self.txs.remove(tx_id)
+            .ok_or_else(|| format!("transaction '{}' not found", tx_id))?;
+        self.tables = snap;
+        Ok(())
     }
 }

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

@@ -6,7 +6,28 @@ pub mod hybrid;
 pub use memory::MemoryEngine;
 #[cfg(not(feature = "wasm"))]
 pub use hybrid::HybridEngine;
-pub use table::{Table, RowStore, FieldValue};
+pub use table::{Table, RowStore, FieldValue, default_value};
+
+pub fn validate_table_name(name: &str) -> Result<(), String> {
+    if name.is_empty() {
+        return Err("table name must not be empty".to_string());
+    }
+    if name.len() > 64 {
+        return Err("table name too long (max 64 chars)".to_string());
+    }
+    if name == "." || name == ".." {
+        return Err(format!("invalid table name '{}'", name));
+    }
+    for (i, c) in name.chars().enumerate() {
+        if c.is_ascii_control() || c == '/' || c == '\\' {
+            return Err(format!("invalid character in table name '{}'", name));
+        }
+        if c == '.' && (i > 0 && name.as_bytes()[i - 1] == b'.') {
+            return Err(format!("invalid table name '{}' ('..' sequences are not allowed)", name));
+        }
+    }
+    Ok(())
+}
 
 use std::collections::HashMap;
 use crate::types::{Row, TableDefinition};