khibino/haskell-relational-record
1
1
Fork 0
mirror of https://github.com/khibino/haskell-relational-record.git synced 2024-12-02 08:12:49 +03:00
Code Issues Projects Releases Wiki Activity

relational-query: apply deprecation of ColumnSQL.

Browse Source
This commit is contained in:
Kei Hibino 2017-03-27 00:39:05 +09:00
parent b2e06ad054
commit 0f951eeab5
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
relational-query/src/Database/Relational/Query/Projection.hs
View File

@ -47,9 +47,7 @@ import qualified Language.SQL.Keyword as SQL
import Database.Record (HasColumnConstraint, NotNull, NotNullColumnConstraint)
import qualified Database.Record.KeyConstraint as KeyConstraint
import Database.Relational.Query.Internal.SQL
(StringSQL, listStringSQL,
ColumnSQL, showsColumnSQL, columnSQL', )
import Database.Relational.Query.Internal.SQL (StringSQL, listStringSQL, )
import Database.Relational.Query.Internal.Sub
(SubQuery, Qualified, UntypedProjection,
Projection, untypeProjection, typedProjection, projectionWidth)
@ -74,7 +72,7 @@ unsafeStringSql = unsafeProjectionStringSql
-- | Get column SQL string list of projection.
columns :: Projection c r -- ^ Source 'Projection'
-> [ColumnSQL] -- ^ Result SQL string list
-> [StringSQL] -- ^ Result SQL string list
columns = projectionColumns
-- | Width of 'Projection'.
@ -101,7 +99,7 @@ unsafeFromTable = Internal.projectFromColumns . Table.columns
-- | Unsafely generate 'Projection' from SQL expression strings.
unsafeFromSqlTerms :: [StringSQL] -> Projection c t
unsafeFromSqlTerms = Internal.projectFromColumns . map columnSQL'
unsafeFromSqlTerms = Internal.projectFromColumns
-- | Unsafely trace projection path.
@ -158,7 +156,7 @@ notNullMaybeConstraint = const KeyConstraint.columnConstraint
-- | Unsafely get SQL string expression of not null key projection.
unsafeStringSqlNotNullMaybe :: HasColumnConstraint NotNull r => Projection c (Maybe r) -> StringSQL
unsafeStringSqlNotNullMaybe p = showsColumnSQL . (!! KeyConstraint.index (notNullMaybeConstraint p)) . columns $ p
unsafeStringSqlNotNullMaybe p = (!! KeyConstraint.index (notNullMaybeConstraint p)) . columns $ p
-- | Projectable fmap of 'Projection' type.
pfmap :: ProductConstructor (a -> b)