mirror of
https://github.com/nushell/nushell.git
synced 2025-06-30 14:40:06 +02:00
Bump rusqlite from 0.24.2 to 0.25.3 (#3523)
This commit is contained in:
@ -115,7 +115,7 @@ users = "0.11.0"
|
||||
[dependencies.rusqlite]
|
||||
features = ["bundled", "blob"]
|
||||
optional = true
|
||||
version = "0.24.2"
|
||||
version = "0.25.3"
|
||||
|
||||
[build-dependencies]
|
||||
shadow-rs = "0.5"
|
||||
|
@ -117,7 +117,7 @@ users = "0.11.0"
|
||||
[dependencies.rusqlite]
|
||||
features = ["bundled", "blob"]
|
||||
optional = true
|
||||
version = "0.24.2"
|
||||
version = "0.25.3"
|
||||
|
||||
[build-dependencies]
|
||||
shadow-rs = "0.5"
|
||||
|
@ -21,6 +21,6 @@ tempfile = "3.2.0"
|
||||
|
||||
[dependencies.rusqlite]
|
||||
features = ["bundled", "blob"]
|
||||
version = "0.24.2"
|
||||
version = "0.25.3"
|
||||
|
||||
[build-dependencies]
|
||||
|
@ -2,7 +2,7 @@ use bigdecimal::FromPrimitive;
|
||||
use nu_errors::ShellError;
|
||||
use nu_protocol::{Primitive, ReturnSuccess, ReturnValue, TaggedDictBuilder, UntaggedValue, Value};
|
||||
use nu_source::Tag;
|
||||
use rusqlite::{types::ValueRef, Connection, Row, NO_PARAMS};
|
||||
use rusqlite::{types::ValueRef, Connection, Row};
|
||||
use std::io::Write;
|
||||
use std::path::Path;
|
||||
|
||||
@ -29,14 +29,14 @@ pub fn convert_sqlite_file_to_nu_value(
|
||||
|
||||
let mut meta_out = Vec::new();
|
||||
let mut meta_stmt = conn.prepare("select name from sqlite_master where type='table'")?;
|
||||
let mut meta_rows = meta_stmt.query(NO_PARAMS)?;
|
||||
let mut meta_rows = meta_stmt.query([])?;
|
||||
|
||||
while let Some(meta_row) = meta_rows.next()? {
|
||||
let table_name: String = meta_row.get(0)?;
|
||||
let mut meta_dict = TaggedDictBuilder::new(tag.clone());
|
||||
let mut out = Vec::new();
|
||||
let mut table_stmt = conn.prepare(&format!("select * from [{}]", table_name))?;
|
||||
let mut table_rows = table_stmt.query(NO_PARAMS)?;
|
||||
let mut table_rows = table_stmt.query([])?;
|
||||
while let Some(table_row) = table_rows.next()? {
|
||||
out.push(convert_sqlite_row_to_nu_value(table_row, tag.clone()))
|
||||
}
|
||||
@ -59,7 +59,7 @@ fn convert_sqlite_row_to_nu_value(row: &Row, tag: impl Into<Tag> + Clone) -> Val
|
||||
for (i, c) in row.column_names().iter().enumerate() {
|
||||
collected.insert_value(
|
||||
c.to_string(),
|
||||
convert_sqlite_value_to_nu_value(row.get_raw(i), tag.clone()),
|
||||
convert_sqlite_value_to_nu_value(row.get_ref_unwrap(i), tag.clone()),
|
||||
);
|
||||
}
|
||||
collected.into_value()
|
||||
|
@ -21,6 +21,6 @@ tempfile = "3.2.0"
|
||||
|
||||
[dependencies.rusqlite]
|
||||
features = ["bundled", "blob"]
|
||||
version = "0.24.2"
|
||||
version = "0.25.3"
|
||||
|
||||
[build-dependencies]
|
||||
|
@ -2,7 +2,7 @@ use hex::encode;
|
||||
use nu_errors::ShellError;
|
||||
use nu_protocol::{Dictionary, Primitive, ReturnSuccess, ReturnValue, UntaggedValue, Value};
|
||||
use nu_source::Tag;
|
||||
use rusqlite::{Connection, NO_PARAMS};
|
||||
use rusqlite::Connection;
|
||||
use std::io::Read;
|
||||
|
||||
#[derive(Default)]
|
||||
@ -138,8 +138,8 @@ fn sqlite_input_stream_to_bytes(values: Vec<Value>) -> Result<Value, std::io::Er
|
||||
continue;
|
||||
}
|
||||
match conn
|
||||
.execute(&create, NO_PARAMS)
|
||||
.and_then(|_| conn.execute(&insert, NO_PARAMS))
|
||||
.execute(&create, [])
|
||||
.and_then(|_| conn.execute(&insert, []))
|
||||
{
|
||||
Ok(_) => (),
|
||||
Err(e) => {
|
||||
|
Reference in New Issue
Block a user