Fix auto-generated index

Concordium · Dec 20, 2024 · 4ab4808 · 4ab4808
1 parent d018345
commit 4ab4808
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 66 deletions.
diff --git a/...nd-rust/.sqlx/query-2fc241b41e7f77660ea9958493cd7050b470f0e5d124554f0ae49aa22172e53e.json b/...nd-rust/.sqlx/query-2fc241b41e7f77660ea9958493cd7050b470f0e5d124554f0ae49aa22172e53e.json
diff --git a/...nd-rust/.sqlx/query-8bc0a5dd70c26f6f701c119f750663f356d03ce16d96695a828af040d459a24a.json b/...nd-rust/.sqlx/query-8bc0a5dd70c26f6f701c119f750663f356d03ce16d96695a828af040d459a24a.json
diff --git a/...nd-rust/.sqlx/query-9a85bd6d290ea3411674d19657f1016d4b553faf0972d359c6c1f1ca485ddcf9.json b/...nd-rust/.sqlx/query-9a85bd6d290ea3411674d19657f1016d4b553faf0972d359c6c1f1ca485ddcf9.json
diff --git a/...nd-rust/.sqlx/query-9c4eea573becbddcfff529441adc2d4ead792d7c7afb7eb1fc4c7689e6207a13.json b/...nd-rust/.sqlx/query-9c4eea573becbddcfff529441adc2d4ead792d7c7afb7eb1fc4c7689e6207a13.json
diff --git a/...nd-rust/.sqlx/query-ef87802bdb6a9407893f24a36aad5a9d3c2bc53dbb9dd03f0194278c560e76ce.json b/...nd-rust/.sqlx/query-ef87802bdb6a9407893f24a36aad5a9d3c2bc53dbb9dd03f0194278c560e76ce.json
diff --git a/backend-rust/migrations/0001_initialize.up.sql b/backend-rust/migrations/0001_initialize.up.sql
@@ -416,7 +416,7 @@ CREATE INDEX scheduled_releases_idx ON scheduled_releases (account_index, releas
 CREATE TABLE tokens (
     -- An index/id for the token (row number).
     index
-        BIGINT GENERATED ALWAYS AS IDENTITY
+        BIGINT
         PRIMARY KEY,
     -- Contract index that the token is associated with.
     contract_index

diff --git a/backend-rust/src/indexer.rs b/backend-rust/src/indexer.rs
@@ -2193,11 +2193,12 @@ async fn process_cis2_events(
             // value in the database.
             sqlx::query!(
                 "
-                INSERT INTO tokens (token_address, contract_index, contract_sub_index, \
+                    INSERT INTO tokens (index, token_address, contract_index, contract_sub_index, \
                  total_supply, token_id, init_transaction_index)
-                VALUES ($1, $2, $3, $4, $5, $6)
-                ON CONFLICT (token_address)
-                DO UPDATE SET total_supply = EXCLUDED.total_supply",
+                    VALUES ((SELECT COALESCE(MAX(index) + 1, 0) FROM tokens), $1, $2, $3, $4, $5, \
+                 $6)
+                    ON CONFLICT (token_address)
+                    DO UPDATE SET total_supply = EXCLUDED.total_supply",
                 token_address,
                 contract_index,
                 contract_sub_index,
@@ -2257,9 +2258,10 @@ async fn process_cis2_events(
             // database.
             sqlx::query!(
                 "
-                    INSERT INTO tokens (token_address, contract_index, contract_sub_index, \
+                    INSERT INTO tokens (index, token_address, contract_index, contract_sub_index, \
                  total_supply, token_id, init_transaction_index)
-                    VALUES ($1, $2, $3, $4, $5, $6)
+                    VALUES ((SELECT COALESCE(MAX(index) + 1, 0) FROM tokens), $1, $2, $3, $4, $5, \
+                 $6)
                     ON CONFLICT (token_address)
                     DO UPDATE SET total_supply = EXCLUDED.total_supply",
                 token_address,
@@ -2289,9 +2291,10 @@ async fn process_cis2_events(
             // database.
             sqlx::query!(
                 "
-                    INSERT INTO tokens (token_address, contract_index, contract_sub_index, \
+                    INSERT INTO tokens (index, token_address, contract_index, contract_sub_index, \
                  metadata_url, token_id, init_transaction_index)
-                    VALUES ($1, $2, $3, $4, $5, $6)
+                    VALUES ((SELECT COALESCE(MAX(index) + 1, 0) FROM tokens), $1, $2, $3, $4, $5, \
+                 $6)
                     ON CONFLICT (token_address)
                     DO UPDATE SET metadata_url = EXCLUDED.metadata_url",
                 token_address,