Skip to content

Commit 9d9ec8c

Browse files
authored
agent: remove unused functions (#1432)
* agent: remove unused functions * cleanup imports
1 parent 992b42e commit 9d9ec8c

File tree

3 files changed

+2
-22
lines changed

3 files changed

+2
-22
lines changed

src/Simplex/Messaging/Agent/Store/Postgres.hs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
module Simplex.Messaging.Agent.Store.Postgres
77
( createDBStore,
8-
defaultSimplexConnectInfo,
98
closeDBStore,
109
execSQL
1110
)
@@ -29,13 +28,6 @@ import UnliftIO.Exception (onException)
2928
import UnliftIO.MVar
3029
import UnliftIO.STM
3130

32-
defaultSimplexConnectInfo :: ConnectInfo
33-
defaultSimplexConnectInfo =
34-
defaultConnectInfo
35-
{ connectUser = "simplex",
36-
connectDatabase = "simplex_v6_3_client_db"
37-
}
38-
3931
-- | Create a new Postgres DBStore with the given connection info, schema name and migrations.
4032
-- This function creates the user and/or database passed in connectInfo if they do not exist
4133
-- (expects the default 'postgres' user and 'postgres' db to exist).

src/Simplex/Messaging/Agent/Store/SQLite/DB.hs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@ module Simplex.Messaging.Agent.Store.SQLite.DB
1616
execute,
1717
execute_,
1818
executeMany,
19-
executeNamed,
2019
query,
2120
query_,
22-
queryNamed,
2321
)
2422
where
2523

@@ -33,7 +31,7 @@ import Data.Map.Strict (Map)
3331
import qualified Data.Map.Strict as M
3432
import Data.Text (Text)
3533
import Data.Time (diffUTCTime, getCurrentTime)
36-
import Database.SQLite.Simple (FromRow, NamedParam, Query, ToRow)
34+
import Database.SQLite.Simple (FromRow, Query, ToRow)
3735
import qualified Database.SQLite.Simple as SQL
3836
import Database.SQLite.Simple.FromField (FromField (..))
3937
import Database.SQLite.Simple.ToField (ToField (..))
@@ -105,11 +103,6 @@ execute_ :: Connection -> Query -> IO ()
105103
execute_ Connection {conn, slow} sql = timeIt slow sql $ SQL.execute_ conn sql
106104
{-# INLINE execute_ #-}
107105

108-
-- TODO [postgres] remove
109-
executeNamed :: Connection -> Query -> [NamedParam] -> IO ()
110-
executeNamed Connection {conn, slow} sql = timeIt slow sql . SQL.executeNamed conn sql
111-
{-# INLINE executeNamed #-}
112-
113106
executeMany :: ToRow q => Connection -> Query -> [q] -> IO ()
114107
executeMany Connection {conn, slow} sql = timeIt slow sql . SQL.executeMany conn sql
115108
{-# INLINE executeMany #-}
@@ -122,9 +115,4 @@ query_ :: FromRow r => Connection -> Query -> IO [r]
122115
query_ Connection {conn, slow} sql = timeIt slow sql $ SQL.query_ conn sql
123116
{-# INLINE query_ #-}
124117

125-
-- TODO [postgres] remove
126-
queryNamed :: FromRow r => Connection -> Query -> [NamedParam] -> IO [r]
127-
queryNamed Connection {conn, slow} sql = timeIt slow sql . SQL.queryNamed conn sql
128-
{-# INLINE queryNamed #-}
129-
130118
$(J.deriveJSON defaultJSON ''SlowQueryStats)

tests/Fixtures.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import Database.PostgreSQL.Simple (ConnectInfo (..), defaultConnectInfo)
1010
testDBConnectInfo :: ConnectInfo
1111
testDBConnectInfo =
1212
defaultConnectInfo {
13-
connectUser = "test_user",
13+
connectUser = "test_agent_user",
1414
connectDatabase = "test_agent_db"
1515
}
1616
#endif

0 commit comments

Comments
 (0)