summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeiHibino <>2017-11-26 07:45:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2017-11-26 07:45:00 (GMT)
commit2f2217460d34d6b803721d229a5f9072920c61ec (patch)
tree9883cc94443eab8775a253220392b01bf441b15d
parentdd967b8b8822b8df1b38cd3c798be8f4a7c1a02d (diff)
version 0.1.6.00.1.6.0
-rw-r--r--ChangeLog.md10
-rw-r--r--relational-schemas.cabal4
-rw-r--r--src/Database/Relational/Schema/DB2Syscat/Columns.hs4
-rw-r--r--src/Database/Relational/Schema/DB2Syscat/Config.hs2
-rw-r--r--src/Database/Relational/Schema/DB2Syscat/Keycoluse.hs4
-rw-r--r--src/Database/Relational/Schema/DB2Syscat/Tabconst.hs4
-rw-r--r--src/Database/Relational/Schema/IBMDB2.hs2
-rw-r--r--src/Database/Relational/Schema/MySQL.hs2
-rw-r--r--src/Database/Relational/Schema/MySQLInfo/Columns.hs4
-rw-r--r--src/Database/Relational/Schema/MySQLInfo/Config.hs2
-rw-r--r--src/Database/Relational/Schema/MySQLInfo/KeyColumnUsage.hs4
-rw-r--r--src/Database/Relational/Schema/MySQLInfo/TableConstraints.hs4
-rw-r--r--src/Database/Relational/Schema/Oracle.hs2
-rw-r--r--src/Database/Relational/Schema/OracleDataDictionary/Config.hs2
-rw-r--r--src/Database/Relational/Schema/OracleDataDictionary/ConsColumns.hs4
-rw-r--r--src/Database/Relational/Schema/OracleDataDictionary/Constraints.hs4
-rw-r--r--src/Database/Relational/Schema/OracleDataDictionary/TabColumns.hs4
-rw-r--r--src/Database/Relational/Schema/PgCatalog/Config.hs2
-rw-r--r--src/Database/Relational/Schema/PgCatalog/PgAttribute.hs4
-rw-r--r--src/Database/Relational/Schema/PgCatalog/PgClass.hs4
-rw-r--r--src/Database/Relational/Schema/PgCatalog/PgConstraint.hs4
-rw-r--r--src/Database/Relational/Schema/PgCatalog/PgNamespace.hs4
-rw-r--r--src/Database/Relational/Schema/PgCatalog/PgType.hs4
-rw-r--r--src/Database/Relational/Schema/PostgreSQL.hs2
-rw-r--r--src/Database/Relational/Schema/SQLServer.hs16
-rw-r--r--src/Database/Relational/Schema/SQLServerSyscat/Columns.hs4
-rw-r--r--src/Database/Relational/Schema/SQLServerSyscat/Config.hs2
-rw-r--r--src/Database/Relational/Schema/SQLServerSyscat/IndexColumns.hs4
-rw-r--r--src/Database/Relational/Schema/SQLServerSyscat/Indexes.hs4
-rw-r--r--src/Database/Relational/Schema/SQLServerSyscat/Types.hs4
-rw-r--r--src/Database/Relational/Schema/SQLite3.hs2
-rw-r--r--src/Database/Relational/Schema/SQLite3Syscat/Config.hs2
-rw-r--r--src/Database/Relational/Schema/SQLite3Syscat/IndexInfo.hs4
-rw-r--r--src/Database/Relational/Schema/SQLite3Syscat/IndexList.hs4
-rw-r--r--src/Database/Relational/Schema/SQLite3Syscat/TableInfo.hs4
35 files changed, 91 insertions, 45 deletions
diff --git a/ChangeLog.md b/ChangeLog.md
index f6a19c3..6ae817d 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,12 +1,16 @@
<!-- -*- Markdown -*- -->
-## 0.1.4.2
+## 0.1.6.0
-- add an upper bound of version constraint.
+- apply projections with overloaded-labels to schema tables.
+
+## 0.1.5.0
+
+- apply relational-query-0.10.0
## 0.1.4.1
-- update version constraint.
+- apply relational-query-0.9.5
## 0.1.4.0
diff --git a/relational-schemas.cabal b/relational-schemas.cabal
index 6f6ba35..09b2770 100644
--- a/relational-schemas.cabal
+++ b/relational-schemas.cabal
@@ -1,5 +1,5 @@
name: relational-schemas
-version: 0.1.4.2
+version: 0.1.6.0
synopsis: RDBMSs' schema templates for relational-query
description: This package contains some RDBMSs' schema structure definitions.
Supported RDBMS schemas are below:
@@ -80,7 +80,7 @@ library
, time
, bytestring
- , relational-query >= 0.9.5 && < 0.10
+ , relational-query >= 0.10.1
if impl(ghc == 7.4.*)
build-depends: ghc-prim == 0.2.*
diff --git a/src/Database/Relational/Schema/DB2Syscat/Columns.hs b/src/Database/Relational/Schema/DB2Syscat/Columns.hs
index 3b0a7b4..040d548 100644
--- a/src/Database/Relational/Schema/DB2Syscat/Columns.hs
+++ b/src/Database/Relational/Schema/DB2Syscat/Columns.hs
@@ -1,5 +1,7 @@
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-}
-- |
@@ -16,7 +18,7 @@ module Database.Relational.Schema.DB2Syscat.Columns where
import GHC.Generics (Generic)
import Data.Int (Int16, Int32, Int64)
-import Database.Relational.Query.TH (defineTableTypesAndRecord)
+import Database.Relational.TH (defineTableTypesAndRecord)
import Database.Relational.Schema.DB2Syscat.Config (config)
diff --git a/src/Database/Relational/Schema/DB2Syscat/Config.hs b/src/Database/Relational/Schema/DB2Syscat/Config.hs
index 8061ae7..91b5d99 100644
--- a/src/Database/Relational/Schema/DB2Syscat/Config.hs
+++ b/src/Database/Relational/Schema/DB2Syscat/Config.hs
@@ -8,7 +8,7 @@
-- Portability : unknown
module Database.Relational.Schema.DB2Syscat.Config (config) where
-import Database.Relational.Query (Config (..), ProductUnitSupport (..), defaultConfig)
+import Database.Relational (Config (..), ProductUnitSupport (..), defaultConfig)
-- | Configuration parameter against IBM DB2.
diff --git a/src/Database/Relational/Schema/DB2Syscat/Keycoluse.hs b/src/Database/Relational/Schema/DB2Syscat/Keycoluse.hs
index 83a81de..6a4c605 100644
--- a/src/Database/Relational/Schema/DB2Syscat/Keycoluse.hs
+++ b/src/Database/Relational/Schema/DB2Syscat/Keycoluse.hs
@@ -1,5 +1,7 @@
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-}
-- |
@@ -18,7 +20,7 @@ module Database.Relational.Schema.DB2Syscat.Keycoluse where
import GHC.Generics (Generic)
import Data.Int (Int16)
-import Database.Relational.Query.TH (defineTableTypesAndRecord)
+import Database.Relational.TH (defineTableTypesAndRecord)
import Database.Relational.Schema.DB2Syscat.Config (config)
diff --git a/src/Database/Relational/Schema/DB2Syscat/Tabconst.hs b/src/Database/Relational/Schema/DB2Syscat/Tabconst.hs
index bdddc60..8dd30cb 100644
--- a/src/Database/Relational/Schema/DB2Syscat/Tabconst.hs
+++ b/src/Database/Relational/Schema/DB2Syscat/Tabconst.hs
@@ -1,5 +1,7 @@
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-}
-- |
@@ -17,7 +19,7 @@
module Database.Relational.Schema.DB2Syscat.Tabconst where
import GHC.Generics (Generic)
-import Database.Relational.Query.TH (defineTableTypesAndRecord)
+import Database.Relational.TH (defineTableTypesAndRecord)
import Database.Relational.Schema.DB2Syscat.Config (config)
diff --git a/src/Database/Relational/Schema/IBMDB2.hs b/src/Database/Relational/Schema/IBMDB2.hs
index ebacb45..c827894 100644
--- a/src/Database/Relational/Schema/IBMDB2.hs
+++ b/src/Database/Relational/Schema/IBMDB2.hs
@@ -26,7 +26,7 @@ import qualified Data.Map as Map
import Data.Time (LocalTime, Day)
import Language.Haskell.TH (TypeQ)
-import Database.Relational.Query
+import Database.Relational
(Query, relationalQuery, Relation, query, relation',
wheres, (.=.), (!), (><), placeholder, asc, value)
diff --git a/src/Database/Relational/Schema/MySQL.hs b/src/Database/Relational/Schema/MySQL.hs
index 4da9a03..986ff62 100644
--- a/src/Database/Relational/Schema/MySQL.hs
+++ b/src/Database/Relational/Schema/MySQL.hs
@@ -18,7 +18,7 @@ import Data.ByteString (ByteString)
import Control.Applicative ((<|>))
import Language.Haskell.TH (TypeQ)
-import Database.Relational.Query ( Query
+import Database.Relational ( Query
, relationalQuery
, query
, relation'
diff --git a/src/Database/Relational/Schema/MySQLInfo/Columns.hs b/src/Database/Relational/Schema/MySQLInfo/Columns.hs
index d1ac443..9b46d84 100644
--- a/src/Database/Relational/Schema/MySQLInfo/Columns.hs
+++ b/src/Database/Relational/Schema/MySQLInfo/Columns.hs
@@ -1,12 +1,14 @@
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-}
module Database.Relational.Schema.MySQLInfo.Columns where
import GHC.Generics (Generic)
import Data.Int (Int16)
-import Database.Relational.Query.TH (defineTableTypesAndRecord)
+import Database.Relational.TH (defineTableTypesAndRecord)
import Database.Relational.Schema.MySQLInfo.Config (config)
diff --git a/src/Database/Relational/Schema/MySQLInfo/Config.hs b/src/Database/Relational/Schema/MySQLInfo/Config.hs
index cb15c9a..af06a2a 100644
--- a/src/Database/Relational/Schema/MySQLInfo/Config.hs
+++ b/src/Database/Relational/Schema/MySQLInfo/Config.hs
@@ -8,7 +8,7 @@
-- Portability : unknown
module Database.Relational.Schema.MySQLInfo.Config (config) where
-import Database.Relational.Query (Config (..), defaultConfig)
+import Database.Relational (Config (..), defaultConfig)
-- | Configuration parameter against MySQL.
diff --git a/src/Database/Relational/Schema/MySQLInfo/KeyColumnUsage.hs b/src/Database/Relational/Schema/MySQLInfo/KeyColumnUsage.hs
index fc17d70..f13a96b 100644
--- a/src/Database/Relational/Schema/MySQLInfo/KeyColumnUsage.hs
+++ b/src/Database/Relational/Schema/MySQLInfo/KeyColumnUsage.hs
@@ -1,12 +1,14 @@
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-}
module Database.Relational.Schema.MySQLInfo.KeyColumnUsage where
import GHC.Generics (Generic)
import Data.Int (Int16)
-import Database.Relational.Query.TH (defineTableTypesAndRecord)
+import Database.Relational.TH (defineTableTypesAndRecord)
import Database.Relational.Schema.MySQLInfo.Config (config)
diff --git a/src/Database/Relational/Schema/MySQLInfo/TableConstraints.hs b/src/Database/Relational/Schema/MySQLInfo/TableConstraints.hs
index 37a3ef3..490f5a5 100644
--- a/src/Database/Relational/Schema/MySQLInfo/TableConstraints.hs
+++ b/src/Database/Relational/Schema/MySQLInfo/TableConstraints.hs
@@ -1,11 +1,13 @@
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-}
module Database.Relational.Schema.MySQLInfo.TableConstraints where
import GHC.Generics (Generic)
-import Database.Relational.Query.TH (defineTableTypesAndRecord)
+import Database.Relational.TH (defineTableTypesAndRecord)
import Database.Relational.Schema.MySQLInfo.Config (config)
diff --git a/src/Database/Relational/Schema/Oracle.hs b/src/Database/Relational/Schema/Oracle.hs
index 575a220..70bdcbd 100644
--- a/src/Database/Relational/Schema/Oracle.hs
+++ b/src/Database/Relational/Schema/Oracle.hs
@@ -14,7 +14,7 @@ import Data.Time (LocalTime)
import Language.Haskell.TH (TypeQ)
-import Database.Relational.Query
+import Database.Relational
import Database.Relational.Schema.OracleDataDictionary.ConsColumns (dbaConsColumns)
import qualified Database.Relational.Schema.OracleDataDictionary.ConsColumns as ConsCols
diff --git a/src/Database/Relational/Schema/OracleDataDictionary/Config.hs b/src/Database/Relational/Schema/OracleDataDictionary/Config.hs
index ce66593..b3c8e94 100644
--- a/src/Database/Relational/Schema/OracleDataDictionary/Config.hs
+++ b/src/Database/Relational/Schema/OracleDataDictionary/Config.hs
@@ -8,7 +8,7 @@
-- Portability : unknown
module Database.Relational.Schema.OracleDataDictionary.Config (config) where
-import Database.Relational.Query (Config, defaultConfig)
+import Database.Relational (Config, defaultConfig)
-- | Configuration parameter against Oracle.
diff --git a/src/Database/Relational/Schema/OracleDataDictionary/ConsColumns.hs b/src/Database/Relational/Schema/OracleDataDictionary/ConsColumns.hs
index 5a1f1c6..579bbc0 100644
--- a/src/Database/Relational/Schema/OracleDataDictionary/ConsColumns.hs
+++ b/src/Database/Relational/Schema/OracleDataDictionary/ConsColumns.hs
@@ -1,12 +1,14 @@
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-}
module Database.Relational.Schema.OracleDataDictionary.ConsColumns where
import GHC.Generics (Generic)
import Data.Int (Int32)
-import Database.Relational.Query.TH (defineTableTypesAndRecord)
+import Database.Relational.TH (defineTableTypesAndRecord)
import Database.Relational.Schema.OracleDataDictionary.Config (config)
diff --git a/src/Database/Relational/Schema/OracleDataDictionary/Constraints.hs b/src/Database/Relational/Schema/OracleDataDictionary/Constraints.hs
index ca3b93f..05efb2d 100644
--- a/src/Database/Relational/Schema/OracleDataDictionary/Constraints.hs
+++ b/src/Database/Relational/Schema/OracleDataDictionary/Constraints.hs
@@ -1,11 +1,13 @@
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-}
module Database.Relational.Schema.OracleDataDictionary.Constraints where
import GHC.Generics (Generic)
-import Database.Relational.Query.TH (defineTableTypesAndRecord)
+import Database.Relational.TH (defineTableTypesAndRecord)
import Database.Relational.Schema.OracleDataDictionary.Config (config)
diff --git a/src/Database/Relational/Schema/OracleDataDictionary/TabColumns.hs b/src/Database/Relational/Schema/OracleDataDictionary/TabColumns.hs
index 57973e1..700faba 100644
--- a/src/Database/Relational/Schema/OracleDataDictionary/TabColumns.hs
+++ b/src/Database/Relational/Schema/OracleDataDictionary/TabColumns.hs
@@ -1,12 +1,14 @@
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-}
module Database.Relational.Schema.OracleDataDictionary.TabColumns where
import GHC.Generics (Generic)
import Data.Int (Int32)
-import Database.Relational.Query.TH (defineTableTypesAndRecord)
+import Database.Relational.TH (defineTableTypesAndRecord)
import Database.Relational.Schema.OracleDataDictionary.Config (config)
diff --git a/src/Database/Relational/Schema/PgCatalog/Config.hs b/src/Database/Relational/Schema/PgCatalog/Config.hs
index 627fd29..fda3e77 100644
--- a/src/Database/Relational/Schema/PgCatalog/Config.hs
+++ b/src/Database/Relational/Schema/PgCatalog/Config.hs
@@ -8,7 +8,7 @@
-- Portability : unknown
module Database.Relational.Schema.PgCatalog.Config (config) where
-import Database.Relational.Query (Config, defaultConfig)
+import Database.Relational (Config, defaultConfig)
-- | Configuration parameter against PostgreSQL.
diff --git a/src/Database/Relational/Schema/PgCatalog/PgAttribute.hs b/src/Database/Relational/Schema/PgCatalog/PgAttribute.hs
index cbe5804..c9dd71d 100644
--- a/src/Database/Relational/Schema/PgCatalog/PgAttribute.hs
+++ b/src/Database/Relational/Schema/PgCatalog/PgAttribute.hs
@@ -1,5 +1,7 @@
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-}
-- |
@@ -14,7 +16,7 @@ module Database.Relational.Schema.PgCatalog.PgAttribute where
import GHC.Generics (Generic)
import Data.Int (Int16, Int32)
-import Database.Relational.Query.TH (defineTableTypesAndRecord)
+import Database.Relational.TH (defineTableTypesAndRecord)
import Database.Relational.Schema.PgCatalog.Config (config)
diff --git a/src/Database/Relational/Schema/PgCatalog/PgClass.hs b/src/Database/Relational/Schema/PgCatalog/PgClass.hs
index feebd50..05ca6cc 100644
--- a/src/Database/Relational/Schema/PgCatalog/PgClass.hs
+++ b/src/Database/Relational/Schema/PgCatalog/PgClass.hs
@@ -1,5 +1,7 @@
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-}
-- |
@@ -14,7 +16,7 @@ module Database.Relational.Schema.PgCatalog.PgClass where
import GHC.Generics (Generic)
import Data.Int (Int32)
-import Database.Relational.Query.TH (defineTableTypesAndRecord)
+import Database.Relational.TH (defineTableTypesAndRecord)
import Database.Relational.Schema.PgCatalog.Config (config)
diff --git a/src/Database/Relational/Schema/PgCatalog/PgConstraint.hs b/src/Database/Relational/Schema/PgCatalog/PgConstraint.hs
index c18dda6..6ba5d94 100644
--- a/src/Database/Relational/Schema/PgCatalog/PgConstraint.hs
+++ b/src/Database/Relational/Schema/PgCatalog/PgConstraint.hs
@@ -1,5 +1,7 @@
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-}
-- |
@@ -14,7 +16,7 @@ module Database.Relational.Schema.PgCatalog.PgConstraint where
import GHC.Generics (Generic)
import Data.Int (Int32)
-import Database.Relational.Query.TH (defineTableTypesAndRecord)
+import Database.Relational.TH (defineTableTypesAndRecord)
import Database.Relational.Schema.PgCatalog.Config (config)
diff --git a/src/Database/Relational/Schema/PgCatalog/PgNamespace.hs b/src/Database/Relational/Schema/PgCatalog/PgNamespace.hs
index 55f8f84..98e4495 100644
--- a/src/Database/Relational/Schema/PgCatalog/PgNamespace.hs
+++ b/src/Database/Relational/Schema/PgCatalog/PgNamespace.hs
@@ -1,5 +1,7 @@
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-}
-- |
@@ -14,7 +16,7 @@ module Database.Relational.Schema.PgCatalog.PgNamespace where
import GHC.Generics (Generic)
import Data.Int (Int32)
-import Database.Relational.Query.TH (defineTableTypesAndRecord)
+import Database.Relational.TH (defineTableTypesAndRecord)
import Database.Relational.Schema.PgCatalog.Config (config)
diff --git a/src/Database/Relational/Schema/PgCatalog/PgType.hs b/src/Database/Relational/Schema/PgCatalog/PgType.hs
index f8baf70..722210b 100644
--- a/src/Database/Relational/Schema/PgCatalog/PgType.hs
+++ b/src/Database/Relational/Schema/PgCatalog/PgType.hs
@@ -1,5 +1,7 @@
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-}
-- |
@@ -14,7 +16,7 @@ module Database.Relational.Schema.PgCatalog.PgType where
import GHC.Generics (Generic)
import Data.Int (Int16, Int32)
-import Database.Relational.Query.TH (defineTableTypesAndRecord)
+import Database.Relational.TH (defineTableTypesAndRecord)
import Database.Relational.Schema.PgCatalog.Config (config)
diff --git a/src/Database/Relational/Schema/PostgreSQL.hs b/src/Database/Relational/Schema/PostgreSQL.hs
index 26e717d..b0fe605 100644
--- a/src/Database/Relational/Schema/PostgreSQL.hs
+++ b/src/Database/Relational/Schema/PostgreSQL.hs
@@ -34,7 +34,7 @@ import Data.Time
(DiffTime, NominalDiffTime,
LocalTime, ZonedTime, Day, TimeOfDay)
-import Database.Relational.Query
+import Database.Relational
(Query, relationalQuery, Relation, query, query', relation', relation, union,
wheres, (.=.), (.>.), in', values, (!), fst', snd',
placeholder, asc, value, unsafeProjectSql, (><))
diff --git a/src/Database/Relational/Schema/SQLServer.hs b/src/Database/Relational/Schema/SQLServer.hs
index 66039d0..7cacfa6 100644
--- a/src/Database/Relational/Schema/SQLServer.hs
+++ b/src/Database/Relational/Schema/SQLServer.hs
@@ -17,10 +17,10 @@ import Data.Char (toLower)
import Data.Int (Int8, Int16, Int32, Int64)
import Data.Map (Map)
import Data.Time (LocalTime, Day, TimeOfDay)
-import Database.Relational.Query (Query, Relation, PlaceHolders, Projection, Flat,
- (!), (.=.), (><), asc, relationalQuery, just, placeholder',
- query, relation', unsafeShowSql,
- unsafeProjectSql, wheres)
+import Database.Relational (Query, Relation, PlaceHolders, Record, Flat,
+ (!), (.=.), (><), asc, relationalQuery, just, placeholder',
+ query, relation', unsafeShowSql,
+ unsafeProjectSql, wheres)
import Database.Relational.Schema.SQLServerSyscat.Columns
import Database.Relational.Schema.SQLServerSyscat.Indexes
import Database.Relational.Schema.SQLServerSyscat.IndexColumns
@@ -75,14 +75,14 @@ getType mapFromSql rec@((cols,typs),typScms) = do
then typ
else [t|Maybe $(typ)|]
-sqlsrvTrue :: Projection Flat Bool
+sqlsrvTrue :: Record Flat Bool
sqlsrvTrue = unsafeProjectSql "1"
-sqlsrvObjectId :: Projection Flat String -> Projection Flat String -> Projection Flat Int32
+sqlsrvObjectId :: Record Flat String -> Record Flat String -> Record Flat Int32
sqlsrvObjectId s t = unsafeProjectSql $
"OBJECT_ID(" ++ unsafeShowSql s ++ " + '.' + " ++ unsafeShowSql t ++ ")"
-sqlsrvOidPlaceHolder :: (PlaceHolders (String, String), Projection Flat Int32)
+sqlsrvOidPlaceHolder :: (PlaceHolders (String, String), Record Flat Int32)
sqlsrvOidPlaceHolder = (nsParam >< relParam, oid)
where
(nsParam, (relParam, oid)) =
@@ -98,7 +98,7 @@ columnTypeRelation = relation' $ do
wheres $ cols ! Columns.userTypeId' .=. typs ! Types.userTypeId'
wheres $ cols ! Columns.objectId' .=. oid
asc $ cols ! Columns.columnId'
- return (params, cols >< typs >< sqlsrvSchemaName (typs ! Types.schemaId' :: Projection Flat Int32))
+ return (params, cols >< typs >< sqlsrvSchemaName (typs ! Types.schemaId' :: Record Flat Int32))
where
(params, oid) = sqlsrvOidPlaceHolder
sqlsrvSchemaName i = unsafeProjectSql $
diff --git a/src/Database/Relational/Schema/SQLServerSyscat/Columns.hs b/src/Database/Relational/Schema/SQLServerSyscat/Columns.hs
index 74f44d0..2f02490 100644
--- a/src/Database/Relational/Schema/SQLServerSyscat/Columns.hs
+++ b/src/Database/Relational/Schema/SQLServerSyscat/Columns.hs
@@ -1,12 +1,14 @@
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-}
module Database.Relational.Schema.SQLServerSyscat.Columns where
import GHC.Generics (Generic)
import Data.Int (Int32)
-import Database.Relational.Query.TH (defineTableTypesAndRecord)
+import Database.Relational.TH (defineTableTypesAndRecord)
import Database.Relational.Schema.SQLServerSyscat.Config (config)
diff --git a/src/Database/Relational/Schema/SQLServerSyscat/Config.hs b/src/Database/Relational/Schema/SQLServerSyscat/Config.hs
index 4fd544b..3a9c30e 100644
--- a/src/Database/Relational/Schema/SQLServerSyscat/Config.hs
+++ b/src/Database/Relational/Schema/SQLServerSyscat/Config.hs
@@ -8,7 +8,7 @@
-- Portability : unknown
module Database.Relational.Schema.SQLServerSyscat.Config (config) where
-import Database.Relational.Query (Config, defaultConfig)
+import Database.Relational (Config, defaultConfig)
-- | Configuration parameter against SQLServer.
diff --git a/src/Database/Relational/Schema/SQLServerSyscat/IndexColumns.hs b/src/Database/Relational/Schema/SQLServerSyscat/IndexColumns.hs
index 88a05e2..c5bca02 100644
--- a/src/Database/Relational/Schema/SQLServerSyscat/IndexColumns.hs
+++ b/src/Database/Relational/Schema/SQLServerSyscat/IndexColumns.hs
@@ -1,12 +1,14 @@
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-}
module Database.Relational.Schema.SQLServerSyscat.IndexColumns where
import GHC.Generics (Generic)
import Data.Int (Int32)
-import Database.Relational.Query.TH (defineTableTypesAndRecord)
+import Database.Relational.TH (defineTableTypesAndRecord)
import Database.Relational.Schema.SQLServerSyscat.Config (config)
diff --git a/src/Database/Relational/Schema/SQLServerSyscat/Indexes.hs b/src/Database/Relational/Schema/SQLServerSyscat/Indexes.hs
index 8151536..b808866 100644
--- a/src/Database/Relational/Schema/SQLServerSyscat/Indexes.hs
+++ b/src/Database/Relational/Schema/SQLServerSyscat/Indexes.hs
@@ -1,12 +1,14 @@
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-}
module Database.Relational.Schema.SQLServerSyscat.Indexes where
import GHC.Generics (Generic)
import Data.Int (Int32)
-import Database.Relational.Query.TH (defineTableTypesAndRecord)
+import Database.Relational.TH (defineTableTypesAndRecord)
import Database.Relational.Schema.SQLServerSyscat.Config (config)
diff --git a/src/Database/Relational/Schema/SQLServerSyscat/Types.hs b/src/Database/Relational/Schema/SQLServerSyscat/Types.hs
index 2d6c3cf..caf501a 100644
--- a/src/Database/Relational/Schema/SQLServerSyscat/Types.hs
+++ b/src/Database/Relational/Schema/SQLServerSyscat/Types.hs
@@ -1,12 +1,14 @@
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-}
module Database.Relational.Schema.SQLServerSyscat.Types where
import GHC.Generics (Generic)
import Data.Int (Int32)
-import Database.Relational.Query.TH (defineTableTypesAndRecord)
+import Database.Relational.TH (defineTableTypesAndRecord)
import Database.Relational.Schema.SQLServerSyscat.Config (config)
diff --git a/src/Database/Relational/Schema/SQLite3.hs b/src/Database/Relational/Schema/SQLite3.hs
index 883cfb0..cf6b270 100644
--- a/src/Database/Relational/Schema/SQLite3.hs
+++ b/src/Database/Relational/Schema/SQLite3.hs
@@ -15,7 +15,7 @@ import Data.Char (toLower, toUpper)
import Data.Int (Int8, Int16, Int32, Int64)
import Data.Map (Map)
import Data.Time (Day, LocalTime)
-import Database.Relational.Query (Query, unsafeTypedQuery)
+import Database.Relational (Query, unsafeTypedQuery)
import Database.Relational.Schema.SQLite3Syscat.IndexInfo
import Database.Relational.Schema.SQLite3Syscat.IndexList
import Database.Relational.Schema.SQLite3Syscat.TableInfo
diff --git a/src/Database/Relational/Schema/SQLite3Syscat/Config.hs b/src/Database/Relational/Schema/SQLite3Syscat/Config.hs
index ebf563c..4469e7b 100644
--- a/src/Database/Relational/Schema/SQLite3Syscat/Config.hs
+++ b/src/Database/Relational/Schema/SQLite3Syscat/Config.hs
@@ -8,7 +8,7 @@
-- Portability : unknown
module Database.Relational.Schema.SQLite3Syscat.Config (config) where
-import Database.Relational.Query (Config, defaultConfig)
+import Database.Relational (Config, defaultConfig)
-- | Configuration parameter against SQLite3.
diff --git a/src/Database/Relational/Schema/SQLite3Syscat/IndexInfo.hs b/src/Database/Relational/Schema/SQLite3Syscat/IndexInfo.hs
index 93802aa..9895fe6 100644
--- a/src/Database/Relational/Schema/SQLite3Syscat/IndexInfo.hs
+++ b/src/Database/Relational/Schema/SQLite3Syscat/IndexInfo.hs
@@ -1,12 +1,14 @@
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-}
module Database.Relational.Schema.SQLite3Syscat.IndexInfo where
import GHC.Generics (Generic)
import Data.Int (Int64)
-import Database.Relational.Query.TH (defineTableTypesAndRecord)
+import Database.Relational.TH (defineTableTypesAndRecord)
import Database.Relational.Schema.SQLite3Syscat.Config (config)
diff --git a/src/Database/Relational/Schema/SQLite3Syscat/IndexList.hs b/src/Database/Relational/Schema/SQLite3Syscat/IndexList.hs
index 4f958f2..cf78e2a 100644
--- a/src/Database/Relational/Schema/SQLite3Syscat/IndexList.hs
+++ b/src/Database/Relational/Schema/SQLite3Syscat/IndexList.hs
@@ -1,12 +1,14 @@
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-}
module Database.Relational.Schema.SQLite3Syscat.IndexList where
import GHC.Generics (Generic)
import Data.Int (Int64)
-import Database.Relational.Query.TH (defineTableTypesAndRecord)
+import Database.Relational.TH (defineTableTypesAndRecord)
import Database.Relational.Schema.SQLite3Syscat.Config (config)
diff --git a/src/Database/Relational/Schema/SQLite3Syscat/TableInfo.hs b/src/Database/Relational/Schema/SQLite3Syscat/TableInfo.hs
index 93fe569..b149cc6 100644
--- a/src/Database/Relational/Schema/SQLite3Syscat/TableInfo.hs
+++ b/src/Database/Relational/Schema/SQLite3Syscat/TableInfo.hs
@@ -1,12 +1,14 @@
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-}
module Database.Relational.Schema.SQLite3Syscat.TableInfo where
import GHC.Generics (Generic)
import Data.Int (Int16, Int64)
-import Database.Relational.Query.TH (defineTableTypesAndRecord)
+import Database.Relational.TH (defineTableTypesAndRecord)
import Database.Relational.Schema.SQLite3Syscat.Config (config)