Skip to content

Commit 7e8ad0a

Browse files
committed
fix: use same parameters orders for SQL queries
1 parent b8b509c commit 7e8ad0a

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

explorer/lib/explorer/models/aggregated_proofs.ex

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ defmodule AggregatedProofs do
7070
def get_newest_aggregated_proof_by_merkle_root(merkle_root) do
7171
query =
7272
from(proof in AggregatedProofs,
73-
order_by: [desc: proof.block_number],
74-
limit: 1,
73+
select: proof,
7574
where: proof.merkle_root == ^merkle_root,
76-
select: proof
75+
order_by: [desc: proof.block_number],
76+
limit: 1
7777
)
7878

7979
Explorer.Repo.one(query)
@@ -82,10 +82,10 @@ defmodule AggregatedProofs do
8282
def get_paginated_proofs(%{page: page, page_size: size}) do
8383
query =
8484
from(proof in AggregatedProofs,
85+
select: proof,
8586
order_by: [desc: proof.block_number],
8687
limit: ^size,
87-
offset: ^((page - 1) * size),
88-
select: proof
88+
offset: ^((page - 1) * size)
8989
)
9090

9191
Explorer.Repo.all(query)

explorer/lib/explorer/models/aggregation_mode_proof.ex

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ defmodule AggregationModeProof do
5252
def get_all_proof_hashes(id) do
5353
query =
5454
from(proof in AggregationModeProof,
55-
where: proof.agg_proof_id == ^id,
56-
select: proof.proof_hash
55+
select: proof.proof_hash,
56+
where: proof.agg_proof_id == ^id
5757
)
5858

5959
Explorer.Repo.all(query)
@@ -62,10 +62,10 @@ defmodule AggregationModeProof do
6262
def get_newest_proof_by_hash(hash) do
6363
query =
6464
from(proof in AggregationModeProof,
65-
limit: 1,
66-
order_by: [desc: proof.inserted_at],
65+
select: proof,
6766
where: proof.proof_hash == ^hash,
68-
select: proof
67+
order_by: [desc: proof.inserted_at],
68+
limit: 1
6969
)
7070

7171
Explorer.Repo.one(query)

explorer/mix.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"floki": {:hex, :floki, "0.36.2", "a7da0193538c93f937714a6704369711998a51a6164a222d710ebd54020aa7a3", [:mix], [], "hexpm", "a8766c0bc92f074e5cb36c4f9961982eda84c5d2b8e979ca67f5c268ec8ed580"},
2525
"gettext": {:hex, :gettext, "0.24.0", "6f4d90ac5f3111673cbefc4ebee96fe5f37a114861ab8c7b7d5b30a1108ce6d8", [:mix], [{:expo, "~> 0.5.1", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "bdf75cdfcbe9e4622dd18e034b227d77dd17f0f133853a1c73b97b3d6c770e8b"},
2626
"hackney": {:hex, :hackney, "1.20.1", "8d97aec62ddddd757d128bfd1df6c5861093419f8f7a4223823537bad5d064e2", [:rebar3], [{:certifi, "~> 2.12.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~> 6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~> 1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~> 1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.4.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~> 1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~> 0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "fe9094e5f1a2a2c0a7d10918fee36bfec0ec2a979994cff8cfe8058cd9af38e3"},
27-
"heroicons": {:git, "https://github.com/tailwindlabs/heroicons.git", "88ab3a0d790e6a47404cba02800a6b25d2afae50", [tag: "v2.1.1", sparse: "optimized", depth: 1]},
27+
"heroicons": {:git, "https://github.com/tailwindlabs/heroicons.git", "88ab3a0d790e6a47404cba02800a6b25d2afae50", [tag: "v2.1.1", sparse: "optimized"]},
2828
"hpax": {:hex, :hpax, "0.2.0", "5a58219adcb75977b2edce5eb22051de9362f08236220c9e859a47111c194ff5", [:mix], [], "hexpm", "bea06558cdae85bed075e6c036993d43cd54d447f76d8190a8db0dc5893fa2f1"},
2929
"httpoison": {:hex, :httpoison, "2.2.1", "87b7ed6d95db0389f7df02779644171d7319d319178f6680438167d7b69b1f3d", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "51364e6d2f429d80e14fe4b5f8e39719cacd03eb3f9a9286e61e216feac2d2df"},
3030
"idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~> 0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},

0 commit comments

Comments
 (0)