Add version to controller in db
This commit is contained in:
parent
ff4d3b9768
commit
9a9192213a
11 changed files with 57 additions and 19 deletions
|
|
@ -27,6 +27,11 @@
|
||||||
"name": "active",
|
"name": "active",
|
||||||
"ordinal": 4,
|
"ordinal": 4,
|
||||||
"type_info": "Bool"
|
"type_info": "Bool"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "version",
|
||||||
|
"ordinal": 5,
|
||||||
|
"type_info": "Text"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"parameters": {
|
"parameters": {
|
||||||
|
|
@ -37,6 +42,7 @@
|
||||||
false,
|
false,
|
||||||
false,
|
false,
|
||||||
false,
|
false,
|
||||||
|
false,
|
||||||
false
|
false
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,11 @@
|
||||||
"name": "active",
|
"name": "active",
|
||||||
"ordinal": 4,
|
"ordinal": 4,
|
||||||
"type_info": "Bool"
|
"type_info": "Bool"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "version",
|
||||||
|
"ordinal": 5,
|
||||||
|
"type_info": "Text"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"parameters": {
|
"parameters": {
|
||||||
|
|
@ -37,6 +42,7 @@
|
||||||
false,
|
false,
|
||||||
false,
|
false,
|
||||||
false,
|
false,
|
||||||
|
false,
|
||||||
false
|
false
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
|
||||||
12
.sqlx/query-b5712e484219de8a3975302168262d61184a43695969a856de3a70a08abb0775.json
generated
Normal file
12
.sqlx/query-b5712e484219de8a3975302168262d61184a43695969a856de3a70a08abb0775.json
generated
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
{
|
||||||
|
"db_name": "SQLite",
|
||||||
|
"query": "UPDATE controllers SET name = ?, relay_count = ?, version = ? WHERE id = ?",
|
||||||
|
"describe": {
|
||||||
|
"columns": [],
|
||||||
|
"parameters": {
|
||||||
|
"Right": 4
|
||||||
|
},
|
||||||
|
"nullable": []
|
||||||
|
},
|
||||||
|
"hash": "b5712e484219de8a3975302168262d61184a43695969a856de3a70a08abb0775"
|
||||||
|
}
|
||||||
|
|
@ -27,6 +27,11 @@
|
||||||
"name": "active",
|
"name": "active",
|
||||||
"ordinal": 4,
|
"ordinal": 4,
|
||||||
"type_info": "Bool"
|
"type_info": "Bool"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "version",
|
||||||
|
"ordinal": 5,
|
||||||
|
"type_info": "Text"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"parameters": {
|
"parameters": {
|
||||||
|
|
@ -37,6 +42,7 @@
|
||||||
false,
|
false,
|
||||||
false,
|
false,
|
||||||
false,
|
false,
|
||||||
|
false,
|
||||||
false
|
false
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,11 @@
|
||||||
"name": "active",
|
"name": "active",
|
||||||
"ordinal": 4,
|
"ordinal": 4,
|
||||||
"type_info": "Bool"
|
"type_info": "Bool"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "version",
|
||||||
|
"ordinal": 5,
|
||||||
|
"type_info": "Text"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"parameters": {
|
"parameters": {
|
||||||
|
|
@ -37,6 +42,7 @@
|
||||||
false,
|
false,
|
||||||
false,
|
false,
|
||||||
false,
|
false,
|
||||||
|
false,
|
||||||
false
|
false
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
{
|
|
||||||
"db_name": "SQLite",
|
|
||||||
"query": "UPDATE controllers SET name = ?, relay_count = ? WHERE id = ?",
|
|
||||||
"describe": {
|
|
||||||
"columns": [],
|
|
||||||
"parameters": {
|
|
||||||
"Right": 3
|
|
||||||
},
|
|
||||||
"nullable": []
|
|
||||||
},
|
|
||||||
"hash": "f7b90a6a0af3f7d7c96158f96f1ada06827a0e5a2d2dbd48bfb8e04f973a6131"
|
|
||||||
}
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"db_name": "SQLite",
|
"db_name": "SQLite",
|
||||||
"query": "INSERT INTO controllers (uid, name, relay_count) VALUES (?, ?, ?) RETURNING *",
|
"query": "INSERT INTO controllers (uid, name, relay_count, version) VALUES (?, ?, ?, ?) RETURNING *",
|
||||||
"describe": {
|
"describe": {
|
||||||
"columns": [
|
"columns": [
|
||||||
{
|
{
|
||||||
|
|
@ -27,18 +27,24 @@
|
||||||
"name": "active",
|
"name": "active",
|
||||||
"ordinal": 4,
|
"ordinal": 4,
|
||||||
"type_info": "Bool"
|
"type_info": "Bool"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "version",
|
||||||
|
"ordinal": 5,
|
||||||
|
"type_info": "Text"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"parameters": {
|
"parameters": {
|
||||||
"Right": 3
|
"Right": 4
|
||||||
},
|
},
|
||||||
"nullable": [
|
"nullable": [
|
||||||
false,
|
false,
|
||||||
false,
|
false,
|
||||||
false,
|
false,
|
||||||
false,
|
false,
|
||||||
|
false,
|
||||||
false
|
false
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"hash": "cdcae4768f7b62390e5e5da850e301b502ffd56dd88485cd73b694f6559ccd4e"
|
"hash": "fa4c9ab4f5af31afb3fa968d6c5062acca7388316e5aa9f2723960fb29336b20"
|
||||||
}
|
}
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
ALTER TABLE controllers DROP COLUMN version TEXT;
|
||||||
1
migrations/20260902000000_add_controller_version.up.sql
Normal file
1
migrations/20260902000000_add_controller_version.up.sql
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
ALTER TABLE controllers ADD COLUMN version TEXT NOT NULL DEFAULT '0.0.0';
|
||||||
|
|
@ -17,6 +17,7 @@ pub struct DbController {
|
||||||
pub name: String,
|
pub name: String,
|
||||||
pub relay_count: i64,
|
pub relay_count: i64,
|
||||||
pub active: bool,
|
pub active: bool,
|
||||||
|
pub version: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl DbController {
|
impl DbController {
|
||||||
|
|
@ -58,10 +59,11 @@ impl DbController {
|
||||||
uid: &EmgauwaUid,
|
uid: &EmgauwaUid,
|
||||||
new_name: &str,
|
new_name: &str,
|
||||||
new_relay_count: i64,
|
new_relay_count: i64,
|
||||||
|
new_version: &str,
|
||||||
) -> Result<DbController, DatabaseError> {
|
) -> Result<DbController, DatabaseError> {
|
||||||
match DbController::get_by_uid(conn, uid).await? {
|
match DbController::get_by_uid(conn, uid).await? {
|
||||||
Some(tag) => Ok(tag),
|
Some(tag) => Ok(tag),
|
||||||
None => DbController::create(conn, uid, new_name, new_relay_count).await,
|
None => DbController::create(conn, uid, new_name, new_relay_count, new_version).await,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -102,13 +104,15 @@ impl DbController {
|
||||||
new_uid: &EmgauwaUid,
|
new_uid: &EmgauwaUid,
|
||||||
new_name: &str,
|
new_name: &str,
|
||||||
new_relay_count: i64,
|
new_relay_count: i64,
|
||||||
|
new_version: &str,
|
||||||
) -> Result<DbController, DatabaseError> {
|
) -> Result<DbController, DatabaseError> {
|
||||||
sqlx::query_as!(
|
sqlx::query_as!(
|
||||||
DbController,
|
DbController,
|
||||||
"INSERT INTO controllers (uid, name, relay_count) VALUES (?, ?, ?) RETURNING *",
|
"INSERT INTO controllers (uid, name, relay_count, version) VALUES (?, ?, ?, ?) RETURNING *",
|
||||||
new_uid,
|
new_uid,
|
||||||
new_name,
|
new_name,
|
||||||
new_relay_count,
|
new_relay_count,
|
||||||
|
new_version,
|
||||||
)
|
)
|
||||||
.fetch_optional(conn.deref_mut())
|
.fetch_optional(conn.deref_mut())
|
||||||
.await?
|
.await?
|
||||||
|
|
@ -120,11 +124,13 @@ impl DbController {
|
||||||
conn: &mut PoolConnection<Sqlite>,
|
conn: &mut PoolConnection<Sqlite>,
|
||||||
new_name: &str,
|
new_name: &str,
|
||||||
new_relay_count: i64,
|
new_relay_count: i64,
|
||||||
|
new_version: &str,
|
||||||
) -> Result<DbController, DatabaseError> {
|
) -> Result<DbController, DatabaseError> {
|
||||||
sqlx::query!(
|
sqlx::query!(
|
||||||
"UPDATE controllers SET name = ?, relay_count = ? WHERE id = ?",
|
"UPDATE controllers SET name = ?, relay_count = ?, version = ? WHERE id = ?",
|
||||||
new_name,
|
new_name,
|
||||||
new_relay_count,
|
new_relay_count,
|
||||||
|
new_version,
|
||||||
self.id,
|
self.id,
|
||||||
)
|
)
|
||||||
.execute(conn.deref_mut())
|
.execute(conn.deref_mut())
|
||||||
|
|
|
||||||
|
|
@ -116,4 +116,4 @@ pub fn printable_relay_states(relay_states: &RelayStates) -> String {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
relay_debug
|
relay_debug
|
||||||
}
|
}
|
||||||
Loading…
Reference in a new issue