greg/mentat
1
0
Fork 0
Code Issues 294 Pull requests Projects Releases 9 Packages Wiki Activity

resolve compile errors from rusqlite update

Browse source
This commit is contained in:
Mark Watts 2021-11-10 22:17:19 -05:00
parent 9a4ba44060
commit b19a994c68
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
db/src/debug.rs
View file

@ -340,7 +340,7 @@ pub fn dump_sql_query(
let r: Result<Vec<_>> = stmt let r: Result<Vec<_>> = stmt
.query_and_then(params, |row| { .query_and_then(params, |row| {
for i in 0..row.column_count() { for i in 0..row.as_ref().column_count() {
let value: rusqlite::types::Value = row.get(i)?; let value: rusqlite::types::Value = row.get(i)?;
write!(&mut tw, "{:?}\t", value).unwrap(); write!(&mut tw, "{:?}\t", value).unwrap();
} }

4
query-projector/src/projectors/pull_two_stage.rs
View file

@ -123,7 +123,7 @@ impl TupleTwoStagePullProjector {
// There will be at least as many SQL columns as Datalog columns. // There will be at least as many SQL columns as Datalog columns.
// gte 'cos we might be querying extra columns for ordering. // gte 'cos we might be querying extra columns for ordering.
// The templates will take care of ignoring columns. // The templates will take care of ignoring columns.
assert!(row.column_count() >= self.len); assert!(row.as_ref().column_count() >= self.len);
self.templates self.templates
.iter() .iter()
.map(|ti| ti.lookup(row)) .map(|ti| ti.lookup(row))
@ -226,7 +226,7 @@ impl RelTwoStagePullProjector {
// There will be at least as many SQL columns as Datalog columns. // There will be at least as many SQL columns as Datalog columns.
// gte 'cos we might be querying extra columns for ordering. // gte 'cos we might be querying extra columns for ordering.
// The templates will take care of ignoring columns. // The templates will take care of ignoring columns.
assert!(row.column_count() >= self.len); assert!(row.as_ref().column_count() >= self.len);
let mut count = 0; let mut count = 0;
for binding in self.templates.iter().map(|ti| ti.lookup(&row)) { for binding in self.templates.iter().map(|ti| ti.lookup(&row)) {
out.push(binding?); out.push(binding?);

4
query-projector/src/projectors/simple.rs
View file

@ -93,7 +93,7 @@ impl TupleProjector {
// There will be at least as many SQL columns as Datalog columns. // There will be at least as many SQL columns as Datalog columns.
// gte 'cos we might be querying extra columns for ordering. // gte 'cos we might be querying extra columns for ordering.
// The templates will take care of ignoring columns. // The templates will take care of ignoring columns.
assert!(row.column_count() >= self.len); assert!(row.as_ref().column_count() >= self.len);
self.templates self.templates
.iter() .iter()
.map(|ti| ti.lookup(&row)) .map(|ti| ti.lookup(&row))
@ -163,7 +163,7 @@ impl RelProjector {
// There will be at least as many SQL columns as Datalog columns. // There will be at least as many SQL columns as Datalog columns.
// gte 'cos we might be querying extra columns for ordering. // gte 'cos we might be querying extra columns for ordering.
// The templates will take care of ignoring columns. // The templates will take care of ignoring columns.
assert!(row.column_count() >= self.len); assert!(row.as_ref().column_count() >= self.len);
let mut count = 0; let mut count = 0;
for binding in self.templates.iter().map(|ti| ti.lookup(&row)) { for binding in self.templates.iter().map(|ti| ti.lookup(&row)) {
out.push(binding?); out.push(binding?);