eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Fix category query (#407)

Browse Source
This commit is contained in:
Geometrically
2022-07-31 14:42:22 -07:00
committed by GitHub
parent b04bced37f
commit 46ab7bbcbe
2 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
sqlx-data.json
View File

@@ -1707,48 +1707,6 @@
}, },
"query": "\n SELECT id, user_id, role, permissions, accepted\n FROM team_members\n WHERE (team_id = $1 AND user_id = $2 AND accepted = TRUE)\n " "query": "\n SELECT id, user_id, role, permissions, accepted\n FROM team_members\n WHERE (team_id = $1 AND user_id = $2 AND accepted = TRUE)\n "
}, },
"4c0ddff96476162ed90800cc91147edec58f12d6d2bc09e67308ed678ac7009f": {
"describe": {
"columns": [
{
"name": "id",
"ordinal": 0,
"type_info": "Int4"
},
{
"name": "category",
"ordinal": 1,
"type_info": "Varchar"
},
{
"name": "icon",
"ordinal": 2,
"type_info": "Varchar"
},
{
"name": "header",
"ordinal": 3,
"type_info": "Varchar"
},
{
"name": "project_type",
"ordinal": 4,
"type_info": "Varchar"
}
],
"nullable": [
false,
false,
false,
false,
false
],
"parameters": {
"Left": []
}
},
"query": "\n SELECT c.id id, c.category category, c.icon icon, c.header header, pt.name project_type\n FROM categories c\n INNER JOIN project_types pt ON c.project_type = pt.id\n ORDER BY c.id\n "
},
"4ccf5373d9593fd19622dba270ae2b194f8029f2fb05ad00ff6b3f2ac4d589b0": { "4ccf5373d9593fd19622dba270ae2b194f8029f2fb05ad00ff6b3f2ac4d589b0": {
"describe": { "describe": {
"columns": [ "columns": [
@@ -3464,6 +3422,48 @@
}, },
"query": "\n SELECT id, team_id, role, permissions, accepted\n FROM team_members\n WHERE user_id = $1\n " "query": "\n SELECT id, team_id, role, permissions, accepted\n FROM team_members\n WHERE user_id = $1\n "
}, },
"8b2e65cec164bb84de6929b1c2afeee28b36d0e36edea75baceaf97d7574bdd7": {
"describe": {
"columns": [
{
"name": "id",
"ordinal": 0,
"type_info": "Int4"
},
{
"name": "category",
"ordinal": 1,
"type_info": "Varchar"
},
{
"name": "icon",
"ordinal": 2,
"type_info": "Varchar"
},
{
"name": "category_header",
"ordinal": 3,
"type_info": "Varchar"
},
{
"name": "project_type",
"ordinal": 4,
"type_info": "Varchar"
}
],
"nullable": [
false,
false,
false,
false,
false
],
"parameters": {
"Left": []
}
},
"query": "\n SELECT c.id id, c.category category, c.icon icon, c.header category_header, pt.name project_type\n FROM categories c\n INNER JOIN project_types pt ON c.project_type = pt.id\n ORDER BY c.id\n "
},
"8b867ee091fe5ffa83eea1a2ca12ce42c6649b84bf9b086f59a288708a61d32c": { "8b867ee091fe5ffa83eea1a2ca12ce42c6649b84bf9b086f59a288708a61d32c": {
"describe": { "describe": {
"columns": [], "columns": [],

4
src/database/models/categories.rs
View File

@@ -149,7 +149,7 @@ impl Category {
{ {
let result = sqlx::query!( let result = sqlx::query!(
" "
SELECT c.id id, c.category category, c.icon icon, c.header header, pt.name project_type SELECT c.id id, c.category category, c.icon icon, c.header category_header, pt.name project_type
FROM categories c FROM categories c
INNER JOIN project_types pt ON c.project_type = pt.id INNER JOIN project_types pt ON c.project_type = pt.id
ORDER BY c.id ORDER BY c.id
@@ -162,7 +162,7 @@ impl Category {
category: c.category, category: c.category,
project_type: c.project_type, project_type: c.project_type,
icon: c.icon, icon: c.icon,
header: c.header header: c.category_header
})) }))
}) })
.try_collect::<Vec<Category>>() .try_collect::<Vec<Category>>()