store: Defer wrapping of SQL queries until execution

The wrapping with to_jsonb is closely tied to how we run the query

Author: lutter

store/postgres/src/deployment_store.rs

@@ -296,6 +296,8 @@ impl DeploymentStore {
         conn: &mut PgConnection,
         query: &str,
     ) -> Result<Vec<SqlQueryObject>, QueryExecutionError> {
+        let query = format!("select to_jsonb(sub.*) as data from ({}) as sub", query);
+
         let query = diesel::sql_query(query);
 
         // Execute the provided SQL query

store/postgres/src/sql/parser.rs

@@ -21,14 +21,10 @@ impl Parser {
         validator.validate_statements(&mut statements)?;
 
         let statement = statements
-            .get_mut(0)
+            .get(0)
             .ok_or_else(|| anyhow!("No SQL statements found"))?;
 
-        let sql = format!(
-            "select to_jsonb(sub.*) as data from ( {} ) as sub",
-            statement
-        );
-        Ok(sql)
+        Ok(statement.to_string())
     }
 }
 

store/postgres/src/sql/parser_tests.yaml

@@ -7,36 +7,32 @@
 
 - sql: select symbol, address from token where decimals > 10
   ok: >
-    select to_jsonb(sub.*) as data from (
       SELECT symbol, address FROM (
         SELECT id, address, symbol, name, decimals FROM "sgd0815"."token" WHERE block_range @> 2147483647) AS token
-      WHERE decimals > 10 ) as sub
+      WHERE decimals > 10
 - sql: >
-        with tokens as (
-            select * from (values
-            ('0x0000000000000000000000000000000000000000','ETH','Ethereum',18),
-            ('0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48','USDC','USD Coin',6)
-            ) as t(address,symbol,name,decimals)
-        )
-
-        select date, t.symbol, SUM(amount)/pow(10,t.decimals) as amount
-          from (select
-                 date(to_timestamp(block_timestamp) at time zone 'utc') as date,
-                 token, amount
-                from swap as sm,
-                     unnest(sm.amounts_in,sm.tokens_in) as smi(amount,token)
-                union all
-                select
-                  date(to_timestamp(block_timestamp) at time zone 'utc') as date,
-                  token, amount
-                from swap as sm,
-                     unnest(sm.amounts_out,sm.tokens_out) as smo(amount,token)) as tp
-        inner join
-          tokens as t on t.address = tp.token
-        group by tp.date, t.symbol, t.decimals
-        order by tp.date desc, amount desc
+      with tokens as (
+          select * from (values
+          ('0x0000000000000000000000000000000000000000','ETH','Ethereum',18),
+          ('0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48','USDC','USD Coin',6)
+          ) as t(address,symbol,name,decimals))
+      select date, t.symbol, SUM(amount)/pow(10,t.decimals) as amount
+        from (select
+               date(to_timestamp(block_timestamp) at time zone 'utc') as date,
+               token, amount
+              from swap as sm,
+                   unnest(sm.amounts_in,sm.tokens_in) as smi(amount,token)
+              union all
+              select
+                date(to_timestamp(block_timestamp) at time zone 'utc') as date,
+                token, amount
+              from swap as sm,
+                   unnest(sm.amounts_out,sm.tokens_out) as smo(amount,token)) as tp
+      inner join
+        tokens as t on t.address = tp.token
+      group by tp.date, t.symbol, t.decimals
+      order by tp.date desc, amount desc
   ok: >
-    select to_jsonb(sub.*) as data from (
       WITH tokens AS (
         SELECT * FROM (
           VALUES ('0x0000000000000000000000000000000000000000', 'ETH', 'Ethereum', 18),
@@ -54,4 +50,4 @@
                      UNNEST(sm.amounts_out, sm.tokens_out) AS smo (amount, token)) AS tp
                   JOIN tokens AS t ON t.address = tp.token
                GROUP BY tp.date, t.symbol, t.decimals
-               ORDER BY tp.date DESC, amount DESC ) as sub
+               ORDER BY tp.date DESC, amount DESC