From b8c3ce5d47338d031d6ccfe3760bd5ac9cdd8fa7 Mon Sep 17 00:00:00 2001 From: Joscha Date: Sun, 6 Aug 2023 13:57:17 +0200 Subject: [PATCH] Order parents and children --- ...6f5ce7a8a3127280030e0adb25c62a1f30c7c97e435ee3d148f6.json} | 4 ++-- ...a215dd53ad69a031d487ab55f01c9c3a2a3a1bd5ffe1889d0e44.json} | 4 ++-- src/web/commit_hash.rs | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) rename .sqlx/{query-167a3c4e2ea3540b2608b75019a112916c8f4c413355366cca8b3e41715081c6.json => query-3fae2fec2ed76f5ce7a8a3127280030e0adb25c62a1f30c7c97e435ee3d148f6.json} (74%) rename .sqlx/{query-73bdd8a83f317d9f815d5d00215de3f740730b01048f73e62f8931e5dafa3d2f.json => query-b8557950e066a215dd53ad69a031d487ab55f01c9c3a2a3a1bd5ffe1889d0e44.json} (74%) diff --git a/.sqlx/query-167a3c4e2ea3540b2608b75019a112916c8f4c413355366cca8b3e41715081c6.json b/.sqlx/query-3fae2fec2ed76f5ce7a8a3127280030e0adb25c62a1f30c7c97e435ee3d148f6.json similarity index 74% rename from .sqlx/query-167a3c4e2ea3540b2608b75019a112916c8f4c413355366cca8b3e41715081c6.json rename to .sqlx/query-3fae2fec2ed76f5ce7a8a3127280030e0adb25c62a1f30c7c97e435ee3d148f6.json index e8a10bb..53603d6 100644 --- a/.sqlx/query-167a3c4e2ea3540b2608b75019a112916c8f4c413355366cca8b3e41715081c6.json +++ b/.sqlx/query-3fae2fec2ed76f5ce7a8a3127280030e0adb25c62a1f30c7c97e435ee3d148f6.json @@ -1,6 +1,6 @@ { "db_name": "SQLite", - "query": "SELECT hash, message, reachable FROM commits JOIN commit_links ON hash = parent WHERE child = ? ", + "query": "SELECT hash, message, reachable FROM commits JOIN commit_links ON hash = parent WHERE child = ? ORDER BY reachable DESC, unixepoch(committer_date) ASC ", "describe": { "columns": [ { @@ -28,5 +28,5 @@ false ] }, - "hash": "167a3c4e2ea3540b2608b75019a112916c8f4c413355366cca8b3e41715081c6" + "hash": "3fae2fec2ed76f5ce7a8a3127280030e0adb25c62a1f30c7c97e435ee3d148f6" } diff --git a/.sqlx/query-73bdd8a83f317d9f815d5d00215de3f740730b01048f73e62f8931e5dafa3d2f.json b/.sqlx/query-b8557950e066a215dd53ad69a031d487ab55f01c9c3a2a3a1bd5ffe1889d0e44.json similarity index 74% rename from .sqlx/query-73bdd8a83f317d9f815d5d00215de3f740730b01048f73e62f8931e5dafa3d2f.json rename to .sqlx/query-b8557950e066a215dd53ad69a031d487ab55f01c9c3a2a3a1bd5ffe1889d0e44.json index 871e460..40799c9 100644 --- a/.sqlx/query-73bdd8a83f317d9f815d5d00215de3f740730b01048f73e62f8931e5dafa3d2f.json +++ b/.sqlx/query-b8557950e066a215dd53ad69a031d487ab55f01c9c3a2a3a1bd5ffe1889d0e44.json @@ -1,6 +1,6 @@ { "db_name": "SQLite", - "query": "SELECT hash, message, reachable FROM commits JOIN commit_links ON hash = child WHERE parent = ? ", + "query": "SELECT hash, message, reachable FROM commits JOIN commit_links ON hash = child WHERE parent = ? ORDER BY reachable DESC, unixepoch(committer_date) ASC ", "describe": { "columns": [ { @@ -28,5 +28,5 @@ false ] }, - "hash": "73bdd8a83f317d9f815d5d00215de3f740730b01048f73e62f8931e5dafa3d2f" + "hash": "b8557950e066a215dd53ad69a031d487ab55f01c9c3a2a3a1bd5ffe1889d0e44" } diff --git a/src/web/commit_hash.rs b/src/web/commit_hash.rs index adbefb5..944ac4b 100644 --- a/src/web/commit_hash.rs +++ b/src/web/commit_hash.rs @@ -60,6 +60,7 @@ pub async fn get( SELECT hash, message, reachable FROM commits \ JOIN commit_links ON hash = parent \ WHERE child = ? \ + ORDER BY reachable DESC, unixepoch(committer_date) ASC \ ", hash ) @@ -73,6 +74,7 @@ pub async fn get( SELECT hash, message, reachable FROM commits \ JOIN commit_links ON hash = child \ WHERE parent = ? \ + ORDER BY reachable DESC, unixepoch(committer_date) ASC \ ", hash )