From 2b18b7c75edc67e638631c2054e94c0fa9f75d5f Mon Sep 17 00:00:00 2001 From: l1xnan Date: Mon, 27 May 2024 00:35:49 +0800 Subject: [PATCH] fix(sqlite): null blob error --- package.json | 10 +- pnpm-lock.yaml | 98 +++---- src-tauri/Cargo.lock | 484 +++++++++++++++++--------------- src-tauri/Cargo.toml | 2 +- src-tauri/src/dialect/sqlite.rs | 23 +- 5 files changed, 332 insertions(+), 285 deletions(-) diff --git a/package.json b/package.json index 70e8f39..aed047c 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@radix-ui/react-toast": "^1.1.5", "@radix-ui/react-toggle": "^1.0.3", "@radix-ui/react-tooltip": "^1.0.7", - "@tabler/icons-react": "^3.3.0", + "@tabler/icons-react": "^3.5.0", "@tanstack/react-table": "^8.15.3", "@tanstack/react-virtual": "^3.5.0", "@tauri-apps/api": "^2.0.0-beta.11", @@ -51,8 +51,8 @@ "@tauri-apps/plugin-shell": "^2.0.0-beta.4", "@tauri-apps/plugin-store": "^2.0.0-beta.3", "@tauri-apps/plugin-updater": "^2.0.0-beta.3", - "@visactor/react-vtable": "^1.0.0", - "@visactor/vtable": "^1.0.0", + "@visactor/react-vtable": "^1.0.3", + "@visactor/vtable": "^1.0.3", "ag-grid-community": "^31.2.0", "ag-grid-react": "^31.2.0", "class-variance-authority": "^0.7.0", @@ -61,7 +61,7 @@ "dedent": "^1.5.3", "deepmerge": "^4.3.1", "immer": "^10.0.3", - "jotai": "^2.8.0", + "jotai": "^2.8.1", "jotai-devtools": "^0.9.1", "jotai-optics": "^0.4.0", "jotai-scope": "^0.6.0", @@ -78,7 +78,7 @@ "react-accessible-treeview": "^2.8.3", "react-arborist": "^3.4.0", "react-dom": "^18.3.1", - "react-hook-form": "^7.51.0", + "react-hook-form": "^7.51.5", "react-horizontal-scrolling-menu": "^7.0.0", "react-hotkeys-hook": "^4.5.0", "react-resizable-panels": "^2.0.13", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 784e9b8..7237a64 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -22,7 +22,7 @@ importers: version: 0.0.7(@headless-tree/core@0.0.8)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@hookform/resolvers': specifier: ^3.3.4 - version: 3.3.4(react-hook-form@7.51.0(react@18.3.1)) + version: 3.3.4(react-hook-form@7.51.5(react@18.3.1)) '@mobily/ts-belt': specifier: ^3.13.1 version: 3.13.1 @@ -96,8 +96,8 @@ importers: specifier: ^1.0.7 version: 1.0.7(@types/react-dom@18.3.0)(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@tabler/icons-react': - specifier: ^3.3.0 - version: 3.3.0(react@18.3.1) + specifier: ^3.5.0 + version: 3.5.0(react@18.3.1) '@tanstack/react-table': specifier: ^8.15.3 version: 8.15.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -129,11 +129,11 @@ importers: specifier: ^2.0.0-beta.3 version: 2.0.0-beta.3 '@visactor/react-vtable': - specifier: ^1.0.0 - version: 1.0.0 + specifier: ^1.0.3 + version: 1.0.3 '@visactor/vtable': - specifier: ^1.0.0 - version: 1.0.0 + specifier: ^1.0.3 + version: 1.0.3 ag-grid-community: specifier: ^31.2.0 version: 31.2.0 @@ -159,23 +159,23 @@ importers: specifier: ^10.0.3 version: 10.0.3 jotai: - specifier: ^2.8.0 - version: 2.8.0(@types/react@18.3.1)(react@18.3.1) + specifier: ^2.8.1 + version: 2.8.1(@types/react@18.3.1)(react@18.3.1) jotai-devtools: specifier: ^0.9.1 version: 0.9.1(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(redux@5.0.1) jotai-optics: specifier: ^0.4.0 - version: 0.4.0(jotai@2.8.0(@types/react@18.3.1)(react@18.3.1))(optics-ts@2.4.1) + version: 0.4.0(jotai@2.8.1(@types/react@18.3.1)(react@18.3.1))(optics-ts@2.4.1) jotai-scope: specifier: ^0.6.0 - version: 0.6.0(jotai@2.8.0(@types/react@18.3.1)(react@18.3.1))(react@18.3.1) + version: 0.6.0(jotai@2.8.1(@types/react@18.3.1)(react@18.3.1))(react@18.3.1) jotai-valtio: specifier: ^0.4.0 - version: 0.4.0(jotai@2.8.0(@types/react@18.3.1)(react@18.3.1))(valtio@1.13.1(@types/react@18.3.1)(react@18.3.1)) + version: 0.4.0(jotai@2.8.1(@types/react@18.3.1)(react@18.3.1))(valtio@1.13.1(@types/react@18.3.1)(react@18.3.1)) jotai-zustand: specifier: ^0.3.0 - version: 0.3.0(jotai@2.8.0(@types/react@18.3.1)(react@18.3.1)) + version: 0.3.0(jotai@2.8.1(@types/react@18.3.1)(react@18.3.1)) keepalive-for-react: specifier: ^2.0.2 version: 2.0.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -210,8 +210,8 @@ importers: specifier: ^18.3.1 version: 18.3.1(react@18.3.1) react-hook-form: - specifier: ^7.51.0 - version: 7.51.0(react@18.3.1) + specifier: ^7.51.5 + version: 7.51.5(react@18.3.1) react-horizontal-scrolling-menu: specifier: ^7.0.0 version: 7.0.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -1679,13 +1679,13 @@ packages: '@swc/types@0.1.7': resolution: {integrity: sha512-scHWahbHF0eyj3JsxG9CFJgFdFNaVQCNAimBlT6PzS3n/HptxqREjsm4OH6AN3lYcffZYSPxXW8ua2BEHp0lJQ==} - '@tabler/icons-react@3.3.0': - resolution: {integrity: sha512-Qn1Po+0gErh1zCWlaOdoVoGqeonWfSuiboYgwZBs6PIJNsj7yr3bIa4BkHmgJgtlXLT9LvCzt/RvwlgjxLfjjg==} + '@tabler/icons-react@3.5.0': + resolution: {integrity: sha512-bn05XKZV3ZfOv5Jr1FCTmVPOQGBVJoA4NefrnR919rqg6WGXAa08NovONHJGSuMxXUMV3b9Cni85diIW/E9yuw==} peerDependencies: react: '>= 16' - '@tabler/icons@3.3.0': - resolution: {integrity: sha512-PLVe9d7b59sKytbx00KgeGhQG3N176Ezv8YMmsnSz4s0ifDzMWlp/h2wEfQZ0ZNe8e377GY2OW6kovUe3Rnd0g==} + '@tabler/icons@3.5.0': + resolution: {integrity: sha512-I53dC3ZSHQ2MZFGvDYJelfXm91L2bTTixS4w5jTAulLhHbCZso5Bih4Rk/NYZxlngLQMKHvEYwZQ+6w/WluKiA==} '@tanstack/react-table@8.15.3': resolution: {integrity: sha512-aocQ4WpWiAh7R+yxNp+DGQYXeVACh5lv2kk96DjYgFiHDCB0cOFoYMT/pM6eDOzeMXR9AvPoLeumTgq8/0qX+w==} @@ -1933,8 +1933,8 @@ packages: resolution: {integrity: sha512-LwUhX8+ttlzJWhqLAkiH7E1tX2WJS0zvK0D83w4L9DRl4TRSQBuGtPIM1+GvG90VMix8sjlGaybBzWfNji1cUw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@visactor/react-vtable@1.0.0': - resolution: {integrity: sha512-+0y7OjDJxejo/hDHH45JHGLo8aZ4CGOpBboXKg++DFzn1q2I9MJmjOs6XYEygZ9QrHXMdtjXYY9cfqVW9XZteA==} + '@visactor/react-vtable@1.0.3': + resolution: {integrity: sha512-8x79GLMly/IOTArAhtmqEOObtsCT6n0rmJNbMCAat9kjUcOs2eLB+ngc7easSVQ8jfFjabKHtkHcq4lDxxSVeA==} '@visactor/vdataset@0.18.1': resolution: {integrity: sha512-ByrBt2kgLvYRve+Q+9oo3Ibav5WVSyWPuxdDJHK7kDTJGtTuV8z4qKcqArB86PcAOJS1s5L0TtHlV4Femm2xoA==} @@ -1954,11 +1954,11 @@ packages: '@visactor/vscale@0.18.1': resolution: {integrity: sha512-0wpd0avbFLvuDKNHt2PxdKdqLSU9+zUkM6GJYWbXsUUYOiKaFkt2xTkdwUHKq66v23C7Iy14Pm7VVr0wVgflbA==} - '@visactor/vtable-editors@1.0.0': - resolution: {integrity: sha512-eW6skFqcGsS24FNw+Pv/6lL8RzadJW4nniY4stACM0ye79bTZ25A+FPUKMOEh8HZt491/4bIQWcSLizE/AomzQ==} + '@visactor/vtable-editors@1.0.3': + resolution: {integrity: sha512-VwZT8kqij/bnkkMMmZRT0VScY0Xz2rm0XTaTvrIazfmtxt009PULWoaGdKTGdpepySrT9JqB9e6/KkbKILD3qQ==} - '@visactor/vtable@1.0.0': - resolution: {integrity: sha512-SAbHUfmKKVULJa/5xcmkPlwXCm2Hiorgk/8n1ErW7lcwQnkp2D/MRsQjqJA4evdJP/sGIdCdxuUDFiFQnQVCpQ==} + '@visactor/vtable@1.0.3': + resolution: {integrity: sha512-rFF8/s28A6MAbmnpf1YdT78FiHM9D6GJXgzvnld1AtSk4ku0jjvmruzvzgcSjT19T9oJ8PCFvL+APD1i949z7Q==} '@visactor/vutils@0.17.5': resolution: {integrity: sha512-HFN6Pk1Wc1RK842g02MeKOlvdri5L7/nqxMVTqxIvi0XMhHXpmoqN4+/9H+h8LmJpVohyrI/MT85TRBV/rManw==} @@ -2850,8 +2850,8 @@ packages: peerDependencies: jotai: '>=1.11.0' - jotai@2.8.0: - resolution: {integrity: sha512-yZNMC36FdLOksOr8qga0yLf14miCJlEThlp5DeFJNnqzm2+ZG7wLcJzoOyij5K6U6Xlc5ljQqPDlJRgqW0Y18g==} + jotai@2.8.1: + resolution: {integrity: sha512-Gmk5Y3yJL/vN5S0rQ6AaWpXH5Q+HBGHThMHXfylVzXGVuO8YxPRtZf8Y9XYvl+h7ZMQXoHNdFi37vNsJFsiszQ==} engines: {node: '>=12.20.0'} peerDependencies: '@types/react': '>=17.0.0' @@ -3302,8 +3302,8 @@ packages: peerDependencies: react: '>=16.13.1' - react-hook-form@7.51.0: - resolution: {integrity: sha512-BggOy5j58RdhdMzzRUHGOYhSz1oeylFAv6jUSG86OvCIvlAvS7KvnRY7yoAf2pfEiPN7BesnR0xx73nEk3qIiw==} + react-hook-form@7.51.5: + resolution: {integrity: sha512-J2ILT5gWx1XUIJRETiA7M19iXHlG74+6O3KApzvqB/w8S5NQR7AbU8HVZrMALdmDgWpRPYiZJl0zx8Z4L2mP6Q==} engines: {node: '>=12.22.0'} peerDependencies: react: ^16.8.0 || ^17 || ^18 @@ -4349,9 +4349,9 @@ snapshots: react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - '@hookform/resolvers@3.3.4(react-hook-form@7.51.0(react@18.3.1))': + '@hookform/resolvers@3.3.4(react-hook-form@7.51.5(react@18.3.1))': dependencies: - react-hook-form: 7.51.0(react@18.3.1) + react-hook-form: 7.51.5(react@18.3.1) '@humanwhocodes/config-array@0.13.0': dependencies: @@ -5303,12 +5303,12 @@ snapshots: dependencies: '@swc/counter': 0.1.3 - '@tabler/icons-react@3.3.0(react@18.3.1)': + '@tabler/icons-react@3.5.0(react@18.3.1)': dependencies: - '@tabler/icons': 3.3.0 + '@tabler/icons': 3.5.0 react: 18.3.1 - '@tabler/icons@3.3.0': {} + '@tabler/icons@3.5.0': {} '@tanstack/react-table@8.15.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: @@ -5572,9 +5572,9 @@ snapshots: '@typescript-eslint/types': 8.0.0-alpha.14 eslint-visitor-keys: 3.4.3 - '@visactor/react-vtable@1.0.0': + '@visactor/react-vtable@1.0.3': dependencies: - '@visactor/vtable': 1.0.0 + '@visactor/vtable': 1.0.3 '@visactor/vutils': 0.18.1 react-is: 18.2.0 @@ -5625,16 +5625,16 @@ snapshots: dependencies: '@visactor/vutils': 0.18.1 - '@visactor/vtable-editors@1.0.0': {} + '@visactor/vtable-editors@1.0.3': {} - '@visactor/vtable@1.0.0': + '@visactor/vtable@1.0.3': dependencies: '@visactor/vdataset': 0.18.1 '@visactor/vrender-components': 0.18.14-alpha.0 '@visactor/vrender-core': 0.18.14-alpha.0 '@visactor/vrender-kits': 0.18.14-alpha.0 '@visactor/vscale': 0.18.1 - '@visactor/vtable-editors': 1.0.0 + '@visactor/vtable-editors': 1.0.3 '@visactor/vutils': 0.18.1 cssfontparser: 1.2.1 @@ -6622,26 +6622,26 @@ snapshots: - react-dom - redux - jotai-optics@0.4.0(jotai@2.8.0(@types/react@18.3.1)(react@18.3.1))(optics-ts@2.4.1): + jotai-optics@0.4.0(jotai@2.8.1(@types/react@18.3.1)(react@18.3.1))(optics-ts@2.4.1): dependencies: - jotai: 2.8.0(@types/react@18.3.1)(react@18.3.1) + jotai: 2.8.1(@types/react@18.3.1)(react@18.3.1) optics-ts: 2.4.1 - jotai-scope@0.6.0(jotai@2.8.0(@types/react@18.3.1)(react@18.3.1))(react@18.3.1): + jotai-scope@0.6.0(jotai@2.8.1(@types/react@18.3.1)(react@18.3.1))(react@18.3.1): dependencies: - jotai: 2.8.0(@types/react@18.3.1)(react@18.3.1) + jotai: 2.8.1(@types/react@18.3.1)(react@18.3.1) react: 18.3.1 - jotai-valtio@0.4.0(jotai@2.8.0(@types/react@18.3.1)(react@18.3.1))(valtio@1.13.1(@types/react@18.3.1)(react@18.3.1)): + jotai-valtio@0.4.0(jotai@2.8.1(@types/react@18.3.1)(react@18.3.1))(valtio@1.13.1(@types/react@18.3.1)(react@18.3.1)): dependencies: - jotai: 2.8.0(@types/react@18.3.1)(react@18.3.1) + jotai: 2.8.1(@types/react@18.3.1)(react@18.3.1) valtio: 1.13.1(@types/react@18.3.1)(react@18.3.1) - jotai-zustand@0.3.0(jotai@2.8.0(@types/react@18.3.1)(react@18.3.1)): + jotai-zustand@0.3.0(jotai@2.8.1(@types/react@18.3.1)(react@18.3.1)): dependencies: - jotai: 2.8.0(@types/react@18.3.1)(react@18.3.1) + jotai: 2.8.1(@types/react@18.3.1)(react@18.3.1) - jotai@2.8.0(@types/react@18.3.1)(react@18.3.1): + jotai@2.8.1(@types/react@18.3.1)(react@18.3.1): optionalDependencies: '@types/react': 18.3.1 react: 18.3.1 @@ -7040,7 +7040,7 @@ snapshots: '@babel/runtime': 7.24.0 react: 18.3.1 - react-hook-form@7.51.0(react@18.3.1): + react-hook-form@7.51.5(react@18.3.1): dependencies: react: 18.3.1 diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index e3ddc2d..6e50314 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -118,9 +118,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arboard" @@ -402,12 +402,11 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.3.0", "event-listener-strategy 0.5.2", "futures-core", "pin-project-lite", @@ -471,7 +470,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -506,7 +505,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -616,7 +615,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -669,9 +668,9 @@ dependencies = [ [[package]] name = "block2" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43ff7d91d3c1d568065b06c899777d1e48dcf76103a672a0adbc238a7f247f1e" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" dependencies = [ "objc2", ] @@ -710,7 +709,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", "syn_derive", ] @@ -791,9 +790,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" [[package]] name = "byteorder" @@ -858,9 +857,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" dependencies = [ "serde", ] @@ -895,7 +894,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a969e13a7589e9e3e4207e153bae624ade2b5622fb4684a4923b23ec3d57719" dependencies = [ "serde", - "toml 0.8.12", + "toml 0.8.13", ] [[package]] @@ -906,9 +905,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.97" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" dependencies = [ "jobserver", "libc", @@ -965,9 +964,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "cfg_aliases" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" @@ -1230,9 +1229,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -1252,9 +1251,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -1289,9 +1288,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -1333,7 +1332,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -1364,14 +1363,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ "darling_core", "darling_macro", @@ -1379,27 +1378,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -1433,7 +1432,7 @@ checksum = "61bb5a1014ce6dfc2a378578509abe775a5aa06bff584a547555d9efdb81b926" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -1503,7 +1502,7 @@ checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -1601,9 +1600,9 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "either" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "embed-resource" @@ -1614,7 +1613,7 @@ dependencies = [ "cc", "memchr", "rustc_version", - "toml 0.8.12", + "toml 0.8.13", "vswhom", "winreg", ] @@ -1658,7 +1657,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -1679,9 +1678,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1884,7 +1883,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -1933,7 +1932,7 @@ checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e" dependencies = [ "frunk_proc_macro_helpers", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -1945,7 +1944,7 @@ dependencies = [ "frunk_core", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -1957,7 +1956,7 @@ dependencies = [ "frunk_core", "frunk_proc_macro_helpers", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -2030,7 +2029,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -2307,7 +2306,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -2386,7 +2385,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -2430,9 +2429,9 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692eaaf7f7607518dd3cef090f1474b61edc5301d8012f09579920df68b725ee" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" dependencies = [ "hashbrown 0.14.5", ] @@ -2573,9 +2572,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "3d8d52be92d09acc2e01dddb7fde3ad983fc6489c7db4837e605bc3fca4cb63e" dependencies = [ "bytes", "futures-channel", @@ -2713,9 +2712,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] @@ -2990,9 +2989,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libduckdb-sys" @@ -3059,9 +3058,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.16" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" +checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" dependencies = [ "cc", "pkg-config", @@ -3076,9 +3075,9 @@ checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" @@ -3239,9 +3238,9 @@ checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", "simd-adler32", @@ -3260,9 +3259,9 @@ dependencies = [ [[package]] name = "muda" -version = "0.13.1" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f428b4e9db3d17e2f809dfb1ff9ddfbbf16c71790d1656d10aee320877e1392f" +checksum = "1717c136c99673f55640c14125a0349a5cd7fee6efcfb0adbfe4c289e3b3f7f2" dependencies = [ "cocoa", "crossbeam-channel", @@ -3279,9 +3278,9 @@ dependencies = [ [[package]] name = "mysql" -version = "25.0.0" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4cc09a8118051e4617886c9c6e693c61444c2eeb5f9a792dc5d631501706565" +checksum = "c6ad644efb545e459029b1ffa7c969d830975bd76906820913247620df10050b" dependencies = [ "bufstream", "bytes", @@ -3293,7 +3292,6 @@ dependencies = [ "mysql_common", "named_pipe", "native-tls", - "once_cell", "pem", "percent-encoding", "serde", @@ -3316,16 +3314,16 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", "termcolor", "thiserror", ] [[package]] name = "mysql_common" -version = "0.32.2" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ccdc1fe2bb3ef97e07ba4397327ed45509a1e2e499e2f8265243879cbc7313c" +checksum = "d1e52cf194ab414202ead9dfda216d2a9ec59cc97ac024ba499ca686d82f040d" dependencies = [ "base64 0.21.7", "bigdecimal", @@ -3472,9 +3470,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3135b08af27d103b0a51f2ae0f8632117b7b185ccf931445affa8df530576a41" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-bigint", "num-complex", @@ -3496,9 +3494,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] @@ -3531,11 +3529,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", @@ -3614,15 +3611,15 @@ dependencies = [ [[package]] name = "objc-sys" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da284c198fb9b7b0603f8635185e85fbd5b64ee154b1ed406d489077de2d6d60" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" [[package]] name = "objc2" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b25e1034d0e636cd84707ccdaa9f81243d399196b8a773946dcffec0401659" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ "objc-sys", "objc2-encode", @@ -3630,43 +3627,87 @@ dependencies = [ [[package]] name = "objc2-app-kit" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb79768a710a9a1798848179edb186d1af7e8a8679f369e4b8d201dd2a034047" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ + "bitflags 2.5.0", "block2", + "libc", "objc2", "objc2-core-data", + "objc2-core-image", "objc2-foundation", + "objc2-quartz-core", ] [[package]] name = "objc2-core-data" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e092bc42eaf30a08844e6a076938c60751225ec81431ab89f5d1ccd9f958d6c" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" dependencies = [ + "bitflags 2.5.0", "block2", "objc2", "objc2-foundation", ] +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + [[package]] name = "objc2-encode" -version = "4.0.1" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88658da63e4cc2c8adb1262902cd6af51094df0488b760d6fd27194269c0950a" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" [[package]] name = "objc2-foundation" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfaefe14254871ea16c7d88968c0ff14ba554712a20d76421eec52f0a7fb8904" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ + "bitflags 2.5.0", "block2", + "libc", "objc2", ] +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + [[package]] name = "objc_exception" version = "0.1.2" @@ -3702,9 +3743,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open" -version = "5.1.2" +version = "5.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32" +checksum = "2eb49fbd5616580e9974662cb96a3463da4476e649a7e4b258df0de065db0657" dependencies = [ "is-wsl", "libc", @@ -3734,7 +3775,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -3814,9 +3855,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -4003,7 +4044,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -4050,7 +4091,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -4067,9 +4108,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" dependencies = [ "atomic-waker", "fastrand", @@ -4235,9 +4276,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" +checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" dependencies = [ "unicode-ident", ] @@ -4384,9 +4425,9 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] name = "raw-window-handle" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc3bcbdb1ddfc11e700e62968e6b4cc9c75bb466464ad28fb61c5b2c964418b" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" [[package]] name = "rayon" @@ -4550,7 +4591,7 @@ dependencies = [ "objc", "objc-foundation", "objc_id", - "raw-window-handle 0.6.1", + "raw-window-handle 0.6.2", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -4610,7 +4651,7 @@ dependencies = [ "bitflags 2.5.0", "fallible-iterator 0.3.0", "fallible-streaming-iterator", - "hashlink 0.9.0", + "hashlink 0.9.1", "libsqlite3-sys", "smallvec", ] @@ -4634,9 +4675,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -4692,15 +4733,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f344d206c5e1b010eec27349b815a4805f70a778895959d70b74b9b529b30a" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.102.3" +version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ "ring", "rustls-pki-types", @@ -4709,9 +4750,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "092474d1a01ea8278f69e6a358998405fae5b8b963ddaeb2b0b04a128bf1dfb0" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" @@ -4745,9 +4786,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.19" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6e7ed6919cb46507fb01ff1654309219f62b4d603822501b0b80d42f6f21ef" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" dependencies = [ "dyn-clone", "indexmap 1.9.3", @@ -4759,14 +4800,14 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.19" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185f2b7aa7e02d418e453790dde16890256bbd2bcd04b7dc5348811052b53f49" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -4841,40 +4882,40 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.200" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" +checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.200" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" +checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] name = "serde_derive_internals" -version = "0.29.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa 1.0.11", "ryu", @@ -4889,14 +4930,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -4940,7 +4981,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -5076,19 +5117,21 @@ dependencies = [ [[package]] name = "softbuffer" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61d5d17f23326fe0d9b0af282f73f3af666699420fd5f42629efd9c6e7dc166f" +checksum = "d09e57a5a6b300bf917329da0ff30a58737d83abb7b14f99a419c23e83007cb8" dependencies = [ "bytemuck", - "cfg_aliases 0.2.0", - "cocoa", + "cfg_aliases 0.2.1", "core-graphics", "foreign-types 0.5.0", "js-sys", "log", - "objc", - "raw-window-handle 0.6.1", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "objc2-quartz-core", + "raw-window-handle 0.6.2", "redox_syscall 0.5.1", "wasm-bindgen", "wayland-sys", @@ -5144,9 +5187,9 @@ dependencies = [ [[package]] name = "sqlparser" -version = "0.45.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7bbffee862a796d67959a89859d6b1046bb5016d63e23835ad0da182777bbe0" +checksum = "11a81a8cad9befe4cf1b9d2d4b9c6841c76f0882a3fec00d95133953c13b3d3d" dependencies = [ "log", "serde", @@ -5213,9 +5256,9 @@ dependencies = [ [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" @@ -5242,7 +5285,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -5255,7 +5298,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -5298,9 +5341,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.61" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -5316,7 +5359,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -5334,15 +5377,15 @@ dependencies = [ "cfg-expr", "heck 0.5.0", "pkg-config", - "toml 0.8.12", + "toml 0.8.13", "version-compare", ] [[package]] name = "tao" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92bcf8885e147b56d6e26751263b45876284f32ca404703f6d3b8f80d16ff4dd" +checksum = "12a8121bd5721ebbbe0889f8286d5824673beeb04071519b68916fbed04f3093" dependencies = [ "bitflags 2.5.0", "cocoa", @@ -5366,7 +5409,7 @@ dependencies = [ "objc", "once_cell", "parking_lot", - "raw-window-handle 0.6.1", + "raw-window-handle 0.6.2", "scopeguard", "tao-macros", "unicode-segmentation", @@ -5413,9 +5456,9 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tauri" -version = "2.0.0-beta.18" +version = "2.0.0-beta.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cca73bf6b6f0ade4274e99a40adaa133133fd8cd3aeba86c3a7ec843380ce8" +checksum = "9f44a74520aa677a4461787902b31373d431749b017862203d39df151892ecb1" dependencies = [ "anyhow", "bytes", @@ -5437,7 +5480,7 @@ dependencies = [ "muda", "objc", "percent-encoding", - "raw-window-handle 0.6.1", + "raw-window-handle 0.6.2", "reqwest", "serde", "serde_json", @@ -5463,9 +5506,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.0.0-beta.14" +version = "2.0.0-beta.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6cf9e29e8b4f6be6e505b96196e31fc6ff7574af5405eb3f26507f9828f02f" +checksum = "1a6829341dde141cd48caabd4f57463444fb1127e7e20e758088be12e866bd77" dependencies = [ "anyhow", "cargo_toml", @@ -5479,15 +5522,15 @@ dependencies = [ "serde_json", "tauri-utils", "tauri-winres", - "toml 0.8.12", + "toml 0.8.13", "walkdir", ] [[package]] name = "tauri-codegen" -version = "2.0.0-beta.14" +version = "2.0.0-beta.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2151dc8c8dbba5085905176539bab2c1cd2c64fed6ece258763ff2080c60c25" +checksum = "de94afa2ee0cc6a7ba99c1300b80a9ede416c54a6a68a0ad38c3ebe1d6fe547c" dependencies = [ "base64 0.22.1", "brotli", @@ -5501,7 +5544,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "syn 2.0.61", + "syn 2.0.66", "tauri-utils", "thiserror", "time", @@ -5512,23 +5555,23 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-beta.14" +version = "2.0.0-beta.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a85b73837b1c5ac218b08e624fa6daa58122199a80972baf0560f3834901b9" +checksum = "305a13d6164bd76f9b407cd1b95031deb1c1a0804c686f5e332a99ee62710ac2" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", "tauri-codegen", "tauri-utils", ] [[package]] name = "tauri-plugin" -version = "2.0.0-beta.14" +version = "2.0.0-beta.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade77c77db5206b493655d44c395ef67c84fec6bd9d4c19237efdced6b3840f8" +checksum = "7f511a86bb648b8d6ea5841719d12966491f472734915b0d510e6eeb299f4371" dependencies = [ "anyhow", "glob", @@ -5537,7 +5580,7 @@ dependencies = [ "serde", "serde_json", "tauri-utils", - "toml 0.8.12", + "toml 0.8.13", "walkdir", ] @@ -5565,7 +5608,7 @@ checksum = "4563f62939a475273e7b75eb4a862f0108969a54db813ef250092d470eff84dc" dependencies = [ "dunce", "log", - "raw-window-handle 0.6.1", + "raw-window-handle 0.6.2", "rfd", "serde", "serde_json", @@ -5627,9 +5670,9 @@ dependencies = [ [[package]] name = "tauri-plugin-shell" -version = "2.0.0-beta.4" +version = "2.0.0-beta.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d961fa0fcacd8ef43f19af2ee71ae27ee16678417f8cdc9841033eede6f3fdb0" +checksum = "ca4973141725f74983f6e89b9ce9c69a18bc0ec0fba23cc4d022986e0325b92b" dependencies = [ "encoding_rs", "log", @@ -5643,6 +5686,7 @@ dependencies = [ "tauri", "tauri-plugin", "thiserror", + "tokio", ] [[package]] @@ -5691,9 +5735,9 @@ dependencies = [ [[package]] name = "tauri-plugin-window-state" -version = "2.0.0-beta.6" +version = "2.0.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6697e94b17db8563e5078db35d9470d7f922d6a38590ae7689ba41cec6f465c" +checksum = "f723f70fef894434dfb265c9b040ea849acc6e49df0d3c66e0b9f9908214b08a" dependencies = [ "bitflags 2.5.0", "log", @@ -5706,15 +5750,15 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.0.0-beta.15" +version = "2.0.0-beta.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9316d393ecb73f9390c57637c169c6b7d06f287924fa275f59cdbcf484eb4580" +checksum = "42e81dc86660cc1421af7967e71857201d8ebf114327465bde819913a27bffc1" dependencies = [ "dpi", "gtk", "http", "jni", - "raw-window-handle 0.6.1", + "raw-window-handle 0.6.2", "serde", "serde_json", "tauri-utils", @@ -5725,9 +5769,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.0.0-beta.15" +version = "2.0.0-beta.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6df23173f0df85d05184f397ba7129c3e5f2efd2f213cf8db43694143b3a2f29" +checksum = "23beea1d1540fe23c33a0791aeba1054f51d84faadc07ff8637b7e5494eba9fa" dependencies = [ "cocoa", "gtk", @@ -5735,7 +5779,7 @@ dependencies = [ "jni", "log", "percent-encoding", - "raw-window-handle 0.6.1", + "raw-window-handle 0.6.2", "softbuffer", "tao", "tauri-runtime", @@ -5749,9 +5793,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-beta.14" +version = "2.0.0-beta.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d236b18d5e37df540e55c99ceec3868da9a861b4089189cca299d6607c9dcd9" +checksum = "199edb0e8969f53decfb683971faa50eb8b421f9034bfa95121286e1e93beaef" dependencies = [ "brotli", "cargo_metadata", @@ -5776,7 +5820,7 @@ dependencies = [ "serde_with", "swift-rs", "thiserror", - "toml 0.8.12", + "toml 0.8.13", "url", "urlpattern", "walkdir", @@ -5832,22 +5876,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -5955,7 +5999,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -6022,21 +6066,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.12", + "toml_edit 0.22.13", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -6078,9 +6122,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.12" +version = "0.22.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" +checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" dependencies = [ "indexmap 2.2.6", "serde", @@ -6102,7 +6146,6 @@ dependencies = [ "tokio", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -6123,7 +6166,6 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -6137,7 +6179,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -6473,7 +6515,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -6507,7 +6549,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6627,7 +6669,7 @@ checksum = "ac1345798ecd8122468840bcdf1b95e5dc6d2206c5e4b0eafa078d061f59c9bc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -6697,7 +6739,7 @@ checksum = "33082acd404763b315866e14a0d5193f3422c81086657583937a750cdd3ec340" dependencies = [ "cocoa", "objc", - "raw-window-handle 0.6.1", + "raw-window-handle 0.6.2", "windows-sys 0.52.0", "windows-version", ] @@ -6750,7 +6792,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -6761,7 +6803,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -7017,9 +7059,9 @@ dependencies = [ [[package]] name = "wry" -version = "0.39.3" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e180ac2740d6cb4d5cec0abf63eacbea90f1b7e5e3803043b13c1c84c4b7884" +checksum = "7cd42682bad8d1efd0e0d0593770c602c13b8922bb1ca705cb845967de81bbc4" dependencies = [ "base64 0.22.1", "block", @@ -7043,7 +7085,7 @@ dependencies = [ "objc_id", "once_cell", "percent-encoding", - "raw-window-handle 0.6.1", + "raw-window-handle 0.6.2", "sha2", "soup3", "tao-macros", @@ -7127,9 +7169,9 @@ dependencies = [ [[package]] name = "zbus" -version = "4.2.0" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aea58d1af0aaa8abf87f3d9ade9b8f46bf13727e5f9fb24bc31ee9d94a9b4ad" +checksum = "989c3977a7aafa97b12b9a35d21cdcff9b0d2289762b14683f45d66b1ba6c48f" dependencies = [ "async-broadcast", "async-process", @@ -7160,14 +7202,14 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.2.0" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf2b496ec1e2d3c4a7878e351607f7a2bec1e1029b353683dfc28a22999e369" +checksum = "6fe9de53245dcf426b7be226a4217dd5e339080e5d46e64a02d6e5dcbf90fca1" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", "zvariant_utils", ] @@ -7199,7 +7241,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.66", ] [[package]] @@ -7286,9 +7328,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "4.0.3" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e9282c6945d9e27742ba7ad7191325546636295de7b83f6735af73159b32ac7" +checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" dependencies = [ "endi", "enumflags2", @@ -7300,24 +7342,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.0.3" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0142549e559746ff09d194dd43d256a554299d286cc56460a082b8ae24652aa1" +checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.1.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75fa7291bdd68cd13c4f97cc9d78cbf16d96305856dfc7ac942aeff4c2de7d5a" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", ] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 6d63acd..1da8ddf 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -55,7 +55,7 @@ async-trait = "^0.1" time = "0.3.34" uuid = { version = "1.7.0", features = ["v4"] } tokio = { version = "1.36.0", features = ["macros", "test-util"] } -sqlparser = { version = "0.45", features = ["json_example"] } +sqlparser = { version = "0.46", features = ["json_example"] } sqlformat = "0.2.3" glob = "*" diff --git a/src-tauri/src/dialect/sqlite.rs b/src-tauri/src/dialect/sqlite.rs index c06cf2a..5486def 100644 --- a/src-tauri/src/dialect/sqlite.rs +++ b/src-tauri/src/dialect/sqlite.rs @@ -122,17 +122,20 @@ impl SqliteDialect { } fn arrow_type(col: &Column) -> DataType { + // https://sqlite.org/datatype3.html#determination_of_column_affinity if let Some(decl_type) = col.decl_type() { match decl_type { - "INTEGER" => DataType::Int64, - "REAL" => DataType::Float64, "BOOLEAN" => DataType::Boolean, - "DATE" => DataType::Utf8, - "DATETIME" => DataType::Utf8, - "TIME" => DataType::Utf8, - decl_type if decl_type.starts_with("NUMERIC") => DataType::Utf8, - decl_type if decl_type.starts_with("NVARCHAR") => DataType::Utf8, - "BLOB" => DataType::Binary, + "DATE" | "DATETIME" | "TIME" => DataType::Utf8, + ty if ty.contains("REAL") || ty.contains("DOUBLE") || ty.contains("FLOAT") => { + DataType::Float64 + } + // INT, INTEGER + ty if ty.contains("INT") => DataType::Int64, + ty if ty.starts_with("NUMERIC") => DataType::Utf8, + // VARCHAR, NVARCHAR, TEXT, CLOB + ty if ty.contains("CHAR") || ty.contains("CLOB") || ty.contains("TEXT") => DataType::Utf8, + "BLOB" => DataType::LargeBinary, "NULL" => DataType::Null, _ => DataType::Utf8, } @@ -174,6 +177,7 @@ impl SqliteDialect { } pub fn convert_arrow(value: &Value, typ: &str) -> ArrayRef { + println!("{:?}", value); match value { Value::Integer(i) => { if typ.starts_with("NUMERIC") || typ.is_empty() { @@ -190,10 +194,11 @@ pub fn convert_arrow(value: &Value, typ: &str) -> ArrayRef { } } Value::Text(s) => Arc::new(StringArray::from(vec![s.clone()])) as ArrayRef, - Value::Blob(b) => Arc::new(BinaryArray::from_vec(vec![b])) as ArrayRef, + Value::Blob(b) => Arc::new(LargeBinaryArray::from_vec(vec![b])) as ArrayRef, Value::Null => match typ { "TEXT" | "NUMERIC" => Arc::new(StringArray::from(vec![None::])) as ArrayRef, "INTEGER" => Arc::new(Int64Array::from(vec![None::])) as ArrayRef, + "BLOB" => Arc::new(LargeBinaryArray::from_opt_vec(vec![None::<&[u8]>])) as ArrayRef, _ => Arc::new(StringArray::from(vec![None::])) as ArrayRef, }, }