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

Remove usage of global imports in db module. Fixes #251. r=nalexander (#253)

Browse source
This commit is contained in:
Jordan Santell 2017-02-10 09:09:13 -08:00 committed by GitHub
parent 49f91b05b0
commit 1deed24f42
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
db/src/bootstrap.rs
View file

@ -12,9 +12,9 @@
use ::{to_namespaced_keyword}; use ::{to_namespaced_keyword};
use edn; use edn;
use errors::{ErrorKind, Result};
use edn::types::Value; use edn::types::Value;
use entids; use entids;
use errors::*;
use db::TypedSQLValue; use db::TypedSQLValue;
use mentat_tx::entities::Entity; use mentat_tx::entities::Entity;
use mentat_tx_parser; use mentat_tx_parser;

4
db/src/db.rs
View file

@ -23,10 +23,10 @@ use ::{repeat_values, to_namespaced_keyword};
use bootstrap; use bootstrap;
use edn::types::Value; use edn::types::Value;
use entids; use entids;
use errors::*;
use mentat_tx::entities as entmod; use mentat_tx::entities as entmod;
use mentat_tx::entities::{Entity, OpType}; use mentat_tx::entities::{Entity, OpType};
use types::*; use errors::{ErrorKind, Result, ResultExt};
use types::{Attribute, DB, Entid, IdentMap, Partition, PartitionMap, Schema, TypedValue, ValueType};
pub fn new_connection<T>(uri: T) -> rusqlite::Result<rusqlite::Connection> where T: AsRef<Path> { pub fn new_connection<T>(uri: T) -> rusqlite::Result<rusqlite::Connection> where T: AsRef<Path> {
let conn = match uri.as_ref().to_string_lossy().len() { let conn = match uri.as_ref().to_string_lossy().len() {

4
db/src/lib.rs
View file

@ -26,10 +26,6 @@ extern crate mentat_tx_parser;
use itertools::Itertools; use itertools::Itertools;
use std::iter::repeat; use std::iter::repeat;
pub use errors::*;
pub use schema::*;
pub use types::*;
pub mod db; pub mod db;
mod bootstrap; mod bootstrap;
mod debug; mod debug;