Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove direct dependence of beam-sqlite on platform-specific packages #739

Merged
merged 1 commit into from
Jan 3, 2025
+31 −39
Merged

Remove direct dependence of beam-sqlite on platform-specific packages #739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions beam-sqlite/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,30 @@
# 0.5.4.0

## Added features

* Removed the reliance on either the `unix` or `windows` package, which should enable (#738)
`beam-sqlite` to be buildable on a wider variety of platforms.

# 0.5.3.1

# Added features
## Added features

* Replaced use of deprecated functions.

# 0.5.3.0

# Added features
## Added features

* Loosen some version bounds
* `HasSqlEqualityCheck` instance for `Day`

# 0.5.2.0

# Bug fixes
## Bug fixes

* Fix encoding for `UTCTime`

# Addded features
## Addded features

* `IN (SELECT ...)` syntax via `inQuery_`

Expand Down
46 changes: 19 additions & 27 deletions beam-sqlite/Database/Beam/Sqlite/Connection.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{-# OPTIONS_GHC -fno-warn-orphans #-}
{-# LANGUAGE BangPatterns #-}
{-# LANGUAGE CPP #-}
{-# LANGUAGE DataKinds #-}
{-# LANGUAGE InstanceSigs #-}
{-# LANGUAGE UndecidableInstances #-}
Expand Down Expand Up @@ -72,6 +71,7 @@ import Data.ByteString.Builder (toLazyByteString)
import qualified Data.ByteString.Char8 as BS
import qualified Data.ByteString.Lazy.Char8 as BL
import qualified Data.DList as D
import Data.Hashable (hash)
import Data.Int
import Data.Maybe (mapMaybe)
import Data.Proxy (Proxy(..))
Expand All @@ -82,21 +82,13 @@ import qualified Data.Text.Encoding as T (decodeUtf8)
import qualified Data.Text.Lazy as TL
import qualified Data.Text.Lazy.Encoding as TL (decodeUtf8)
import Data.Time ( LocalTime, UTCTime, Day
, ZonedTime, utc, utcToLocalTime )
, ZonedTime, utc, utcToLocalTime, getCurrentTime )
import Data.Typeable (cast)
import Data.Word
import GHC.TypeLits

import Network.URI

#ifdef UNIX
import System.Posix.Process (getProcessID)
#elif defined(WINDOWS)
import System.Win32.Process (getCurrentProcessId)
#else
#error Need either POSIX or Win32 API for MonadBeamInsertReturning
#endif

import Text.Read (readMaybe)

-- | The SQLite backend. Used to parameterize 'MonadBeam' and 'FromBackendRow'
Expand Down Expand Up @@ -388,34 +380,34 @@ runInsertReturningList SqlInsertNoRows = pure []
runInsertReturningList (SqlInsert tblSettings insertStmt_@(SqliteInsertSyntax nm _ _ _)) =
do (logger, conn) <- SqliteM ask
SqliteM . liftIO $ do

#ifdef UNIX
processId <- fromString . show <$> getProcessID
#elif defined(WINDOWS)
processId <- fromString . show <$> getCurrentProcessId
#else
#error Need either POSIX or Win32 API for MonadBeamInsertReturning
#endif
-- We create a pseudo-random savepoint identification that can be referenced
-- throughout this operation. -- This used to be based on the process ID
-- (e.g. `System.Posix.Process.getProcessID` for UNIX),
-- but using timestamps is more portable; see #738
--
-- Note that `hash` can return negative numbers, hence the use of `abs`.
savepointId <- fromString . show . abs . hash <$> getCurrentTime

let tableNameTxt = T.decodeUtf8 (BL.toStrict (sqliteRenderSyntaxScript (fromSqliteTableName nm)))

startSavepoint =
execute_ conn (Query ("SAVEPOINT insert_savepoint_" <> processId))
execute_ conn (Query ("SAVEPOINT insert_savepoint_" <> savepointId))
rollbackToSavepoint =
execute_ conn (Query ("ROLLBACK TRANSACTION TO SAVEPOINT insert_savepoint_" <> processId))
execute_ conn (Query ("ROLLBACK TRANSACTION TO SAVEPOINT insert_savepoint_" <> savepointId))
releaseSavepoint =
execute_ conn (Query ("RELEASE SAVEPOINT insert_savepoint_" <> processId))
execute_ conn (Query ("RELEASE SAVEPOINT insert_savepoint_" <> savepointId))

createInsertedValuesTable =
execute_ conn (Query ("CREATE TEMPORARY TABLE inserted_values_" <> processId <> " AS SELECT * FROM " <> tableNameTxt <> " LIMIT 0"))
execute_ conn (Query ("CREATE TEMPORARY TABLE inserted_values_" <> savepointId <> " AS SELECT * FROM " <> tableNameTxt <> " LIMIT 0"))
dropInsertedValuesTable =
execute_ conn (Query ("DROP TABLE inserted_values_" <> processId))
execute_ conn (Query ("DROP TABLE inserted_values_" <> savepointId))

createInsertTrigger =
execute_ conn (Query ("CREATE TEMPORARY TRIGGER insert_trigger_" <> processId <> " AFTER INSERT ON " <> tableNameTxt <> " BEGIN " <>
"INSERT INTO inserted_values_" <> processId <> " SELECT * FROM " <> tableNameTxt <> " WHERE ROWID=last_insert_rowid(); END" ))
execute_ conn (Query ("CREATE TEMPORARY TRIGGER insert_trigger_" <> savepointId <> " AFTER INSERT ON " <> tableNameTxt <> " BEGIN " <>
"INSERT INTO inserted_values_" <> savepointId <> " SELECT * FROM " <> tableNameTxt <> " WHERE ROWID=last_insert_rowid(); END" ))
dropInsertTrigger =
execute_ conn (Query ("DROP TRIGGER insert_trigger_" <> processId))
execute_ conn (Query ("DROP TRIGGER insert_trigger_" <> savepointId))


mask $ \restore -> do
Expand All @@ -430,7 +422,7 @@ runInsertReturningList (SqlInsert tblSettings insertStmt_@(SqliteInsertSyntax nm
allBeamValues (\(Columnar' projField) -> quotedIdentifier (_fieldName projField)) $
tblSettings

fmap (\(BeamSqliteRow r) -> r) <$> query_ conn (Query ("SELECT " <> columns <> " FROM inserted_values_" <> processId))
fmap (\(BeamSqliteRow r) -> r) <$> query_ conn (Query ("SELECT " <> columns <> " FROM inserted_values_" <> savepointId))
releaseSavepoint
return x

Expand Down
9 changes: 1 addition & 8 deletions beam-sqlite/beam-sqlite.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: beam-sqlite
version: 0.5.3.1
version: 0.5.4.0
synopsis: Beam driver for SQLite
description: Beam driver for the <https://sqlite.org/ SQLite> embedded database.
See <https://haskell-beam.github.io/beam/user-guide/backends/beam-sqlite/ here>
Expand Down Expand Up @@ -50,13 +50,6 @@ library
if flag(werror)
ghc-options: -Werror

if os(windows)
cpp-options: -DWINDOWS
build-depends: Win32 >=2.4 && <2.8
if os(freebsd) || os(netbsd) || os(openbsd) || os(darwin) || os(linux) || os(solaris) || os(android)
cpp-options: -DUNIX
build-depends: unix >=2.0 && <2.9

test-suite beam-sqlite-tests
type: exitcode-stdio-1.0
hs-source-dirs: test
Expand Down
Loading