Fix up some sql

unisoncomputing · Jul 24, 2024 · b0fb139 · b0fb139
1 parent 35422d3
commit b0fb139
Show file tree

Hide file tree

Showing 9 changed files with 112 additions and 362 deletions.
diff --git a/Queries.hs b/Queries.hs
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -17,10 +17,10 @@ services:
       POSTGRES_PASSWORD: sekrit
     volumes:
       - ../sql:/docker-entrypoint-initdb.d
-      # # Optionally persist the data between container invocations
-      # - postgresVolume:/var/lib/postgresql/data
+      # Optionally persist the data between container invocations
+      - postgresVolume:/var/lib/postgresql/data
       - ./postgresql.conf:/etc/postgresql/postgresql.conf
-    command: postgres -c config_file=/etc/postgresql/postgresql.conf #  -c log_statement=all
+    command: postgres -c config_file=/etc/postgresql/postgresql.conf   -c log_statement=all
 
 
   redis:
@@ -85,5 +85,5 @@ services:
       - redis
       - postgres
 
-# volumes:
-#   postgresVolume:
+volumes:
+  postgresVolume:
diff --git a/share-api.cabal b/share-api.cabal
@@ -70,6 +70,7 @@ library
       Share.Postgres.Projects.Queries
       Share.Postgres.Queries
       Share.Postgres.Refs.Types
+      Share.Postgres.Releases.Queries
       Share.Postgres.Search.DefinitionSearch.Queries
       Share.Postgres.Serialization
       Share.Postgres.Sync.Conversions

diff --git a/src/Share/Postgres/Hashes/Queries.hs b/src/Share/Postgres/Hashes/Queries.hs
@@ -338,34 +338,3 @@ expectCausalIdByHash :: (HasCallStack) => CausalHash -> Codebase.CodebaseM e Cau
 expectCausalIdByHash causalHash = do
   loadCausalIdByHash causalHash
     `whenNothingM` unrecoverableError (MissingExpectedEntity $ "Expected causal id for hash: " <> tShow causalHash)
-
--- | TODO:
-
----- | Expands shorthashes to their full form (still as a ShortHash)
-----
----- Note: Be wary, this could cause hashes which are unknown to a user to leak if they're not
--- expandShortHashesOf :: (HasCallStack) => Traversal s t ShortHash ShortHash -> s -> CodebaseM e t
--- expandShortHashesOf trav s = do
---  codebaseOwner <- asks Codebase.codebaseOwner
---  s
---    & unsafePartsOf (trav . prefix_) %%~ \shortHashes -> do
---      let numberedShortHashes = zip [0 :: Int32 ..] shortHashes
---      results :: [Text] <-
---        queryListCol
---          [sql|
---      WITH hash_prefixes(ord, prefix) AS (
---        SELECT * FROM ^{toTable numberedShortHashes}
---      )
---      SELECT sh.prefix
---        FROM hash_prefixes sh
---          JOIN short_hashes sh2 ON sh.prefix = sh2.prefix
---        ORDER BY sh.ord ASC
---      |]
---      if length results /= length shortHashes
---        then error "expandShortHashesOf: Missing expected short hash"
---        else pure results
---  where
---    prefix_ :: Traversal' ShortHash Text
---    prefix_ f = \case
---      SH.Builtin b -> pure $ SH.Builtin b
---      SH.ShortHash p c i -> SH.ShortHash <$> f p <*> pure c <*> pure i