44//!
55//! Installation & programming guide: [https://mlin.github.io/GenomicSQLite/](https://mlin.github.io/GenomicSQLite/)
66use json:: object:: Object ;
7- use rusqlite:: { params, Connection , LoadExtensionGuard , OpenFlags , Result , NO_PARAMS } ;
7+ use rusqlite:: { params, Connection , LoadExtensionGuard , OpenFlags , Result } ;
88use std:: collections:: HashMap ;
99use std:: env;
1010#[ cfg( feature = "bundle_libgenomicsqlite" ) ]
@@ -80,8 +80,7 @@ fn bundle_libgenomicsqlite() -> Option<(String, TempDir)> {
8080// helper for simple queries
8181fn query1str < P > ( conn : & Connection , sql : & str , params : P ) -> Result < String >
8282where
83- P : IntoIterator ,
84- P :: Item : rusqlite:: ToSql ,
83+ P : rusqlite:: Params ,
8584{
8685 let ans: Result < String > = conn. query_row ( sql, params, |row| row. get ( 0 ) ) ;
8786 ans
@@ -243,7 +242,7 @@ pub trait ConnectionMethods {
243242
244243impl ConnectionMethods for Connection {
245244 fn genomicsqlite_version ( & self ) -> String {
246- query1str ( self , "SELECT genomicsqlite_version()" , NO_PARAMS ) . unwrap ( )
245+ query1str ( self , "SELECT genomicsqlite_version()" , [ ] ) . unwrap ( )
247246 }
248247
249248 fn genomicsqlite_attach_sql < P : AsRef < Path > > (
@@ -358,7 +357,7 @@ impl ConnectionMethods for Connection {
358357 ) ;
359358 let mut stmt = self . prepare ( & sql) ?;
360359 let assembly_param = params ! [ assembly] ;
361- let refseqs = stmt. query_map ( assembly. map_or ( NO_PARAMS , |_| & assembly_param) , |row| {
360+ let refseqs = stmt. query_map ( assembly. map_or ( params ! [ ] , |_| & assembly_param) , |row| {
362361 let meta_json_str: String = row. get ( 5 ) ?;
363362 Ok ( RefSeq {
364363 rid : row. get ( 0 ) ?,
@@ -406,7 +405,7 @@ impl ConnectionMethods for Connection {
406405#[ cfg( test) ]
407406mod tests {
408407 use super :: ConnectionMethods ;
409- use rusqlite:: { OpenFlags , NO_PARAMS } ;
408+ use rusqlite:: OpenFlags ;
410409
411410 #[ test]
412411 fn smoke_test ( ) {
@@ -425,7 +424,7 @@ mod tests {
425424
426425 // check that tuning SQL applied successfully
427426 let mut ans: i64 = conn
428- . query_row ( "PRAGMA threads" , NO_PARAMS , |row| row. get ( 0 ) )
427+ . query_row ( "PRAGMA threads" , [ ] , |row| row. get ( 0 ) )
429428 . unwrap ( ) ;
430429 assert_eq ! ( ans, 3 ) ;
431430
@@ -453,7 +452,7 @@ mod tests {
453452 ans = conn
454453 . query_row (
455454 "SELECT COUNT(*) FROM genomic_range_rowids('feature',3,34,34)" ,
456- NO_PARAMS ,
455+ [ ] ,
457456 |row| row. get ( 0 ) ,
458457 )
459458 . unwrap ( ) ;
@@ -482,9 +481,7 @@ mod tests {
482481 & config,
483482 ) . unwrap ( ) ;
484483 let ans: i64 = conn
485- . query_row ( "SELECT COUNT(1) FROM sqlite_master" , NO_PARAMS , |row| {
486- row. get ( 0 )
487- } )
484+ . query_row ( "SELECT COUNT(1) FROM sqlite_master" , [ ] , |row| row. get ( 0 ) )
488485 . unwrap ( ) ;
489486 assert_eq ! ( ans, 12 ) ;
490487 }
0 commit comments