Getting Jenkins working again.

src/data/global.rs

@@ -1,9 +1,4 @@
-pub mod database;
-pub mod id;
-mod record;
-pub mod table;
-
-use crate::{data::database::Database, error::MTTError};
+use crate::{data::IDPath, error::MTTError};
 use std::{collections::HashMap, fmt, ops::Deref};
 
 #[derive(Debug, Clone)]
@@ -35,7 +30,7 @@ mod errors {
 }
 
 struct Global {
-    databases: HashMap<String, Database>,
+    databases: HashMap<String, IDPath>,
 }
 
 impl Global {
@@ -45,7 +40,7 @@ impl Global {
         }
     }
 
-    fn add_database(&mut self, name: &str, db: Database) -> Result<(), MTTError> {
+    fn add_database(&mut self, name: &str, db: IDPath) -> Result<(), MTTError> {
         match self.databases.get(name) {
             Some(_) => {
                 let err = GblError::DuplicateDB(name.to_string());
@@ -60,7 +55,7 @@ impl Global {
 }
 
 impl Deref for Global {
-    type Target = HashMap<String, Database>;
+    type Target = HashMap<String, IDPath>;
 
     fn deref(&self) -> &Self::Target {
         &self.databases
@@ -80,7 +75,7 @@ mod gblverses {
     #[test]
     fn add_database() {
         let mut gbl = Global::new();
-        let db = Database::new();
+        let db = IDPath::new();
         gbl.add_database("barney", db).unwrap();
         assert_eq!(gbl.len(), 1);
     }
@@ -88,8 +83,8 @@ mod gblverses {
     #[test]
     fn no_duplicate_dbs() {
         let mut gbl = Global::new();
-        let db1 = Database::new();
-        let db2 = Database::new();
+        let db1 = IDPath::new();
+        let db2 = IDPath::new();
         let name = "duplicate";
         gbl.add_database("barney", db2).unwrap();
         match gbl.add_database("barney", db1) {

src/error.rs

@@ -1,4 +1,4 @@
-use crate::data::{database::DBError, id::IDError, table::TBLError, GblError};
+use crate::data::{database::DBError, global::GblError, id::IDError, table::TBLError};
 use std::{error::Error, fmt};
 
 #[derive(Debug)]