diff --git a/backend/src/driver_data.rs b/backend/src/driver_data.rs index 9cdd38f..bd1e790 100644 --- a/backend/src/driver_data.rs +++ b/backend/src/driver_data.rs @@ -1,13 +1,18 @@ use crate::models::{Driver, NewDriver}; use common::CommonDriver; -use diesel::prelude::*; +use diesel::{prelude::*, query_builder::SqlQuery, sql_query}; -pub fn listdrivers(connection: &mut PgConnection) { - use crate::schema::drivers::dsl::*; - let queury = drivers.load::(connection).expect("KANKER"); - for driver in queury { - println!("{} {}", driver.name, driver.address); +pub fn listdrivers(connection: &mut PgConnection) -> Vec { + let query = sql_query("SELECT * FROM drivers WHERE id = 10").load::(connection); + let mut drivers: Vec = Vec::new(); + for driver in query.unwrap() { + drivers.push(CommonDriver { + id: driver.id, + name: driver.name, + address: driver.address, + }); } + return drivers; } pub fn addriver(connection: &mut PgConnection, new_driver: NewDriver) { @@ -31,4 +36,3 @@ pub fn get_driver(connection: &mut PgConnection, driver_id: i32) -> CommonDriver address: String::from(&driver.address), }; } - diff --git a/backend/src/models.rs b/backend/src/models.rs index 5d242c1..ed035e1 100644 --- a/backend/src/models.rs +++ b/backend/src/models.rs @@ -67,7 +67,8 @@ pub struct AutoIssuedTicket<'a> { } //Drivers -#[derive(Queryable, AsChangeset, Identifiable)] +#[derive(Queryable, AsChangeset, Identifiable, QueryableByName)] +#[table_name = "drivers"] pub struct Driver { pub id: i32, pub name: String, @@ -87,8 +88,8 @@ pub struct NewDriver<'a> { } //Vehicles -#[derive(Queryable)] -#[diesel(belongs_to(Driver))] +#[derive(Queryable, QueryableByName)] +#[diesel(belongs_to(Driver), table_name = vehicles)] pub struct Vehicle { pub model: Option, pub color: Option, diff --git a/backend/src/yes.rs b/backend/src/yes.rs deleted file mode 100644 index e69de29..0000000 diff --git a/frontend/dist/db-frontend-c0621f030a0450bc.js b/frontend/dist/db-frontend-906e3d2c2bbb6313.js similarity index 98% rename from frontend/dist/db-frontend-c0621f030a0450bc.js rename to frontend/dist/db-frontend-906e3d2c2bbb6313.js index c894770..bacefbe 100644 --- a/frontend/dist/db-frontend-c0621f030a0450bc.js +++ b/frontend/dist/db-frontend-906e3d2c2bbb6313.js @@ -615,12 +615,12 @@ function getImports() { imports.wbg.__wbindgen_throw = function(arg0, arg1) { throw new Error(getStringFromWasm0(arg0, arg1)); }; - imports.wbg.__wbindgen_closure_wrapper4152 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 287, __wbg_adapter_18); + imports.wbg.__wbindgen_closure_wrapper4026 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 272, __wbg_adapter_18); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper4211 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 303, __wbg_adapter_21); + imports.wbg.__wbindgen_closure_wrapper4088 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 288, __wbg_adapter_21); return addHeapObject(ret); }; @@ -658,7 +658,7 @@ function initSync(module) { async function init(input) { if (typeof input === 'undefined') { - input = new URL('db-frontend-c0621f030a0450bc_bg.wasm', import.meta.url); + input = new URL('db-frontend-906e3d2c2bbb6313_bg.wasm', import.meta.url); } const imports = getImports(); diff --git a/frontend/dist/db-frontend-906e3d2c2bbb6313_bg.wasm b/frontend/dist/db-frontend-906e3d2c2bbb6313_bg.wasm new file mode 100644 index 0000000..c0af028 Binary files /dev/null and b/frontend/dist/db-frontend-906e3d2c2bbb6313_bg.wasm differ diff --git a/frontend/dist/db-frontend-c0621f030a0450bc_bg.wasm b/frontend/dist/db-frontend-c0621f030a0450bc_bg.wasm deleted file mode 100644 index bc31daf..0000000 Binary files a/frontend/dist/db-frontend-c0621f030a0450bc_bg.wasm and /dev/null differ diff --git a/frontend/dist/index.html b/frontend/dist/index.html index 46ef420..ab6c616 100644 --- a/frontend/dist/index.html +++ b/frontend/dist/index.html @@ -2,10 +2,10 @@ Ze greatest - - + + -