version 0.1.5.00.1.5.0

35 files changed, 50 insertions, 42 deletions

diff --git a/ChangeLog.md b/ChangeLog.md
index 054666e..d968473 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,13 @@
 <!-- -*- Markdown -*- -->
 
+## 0.1.5.0
+
+- apply relational-query-0.10.0
+
+## 0.1.4.1
+
+- apply relational-query-0.9.5
+
 ## 0.1.4.0
 
 - add tested-with 8.2.1.
diff --git a/relational-schemas.cabal b/relational-schemas.cabal
index 59cf768..d153957 100644
--- a/relational-schemas.cabal
+++ b/relational-schemas.cabal
@@ -1,5 +1,5 @@
 name:                relational-schemas
-version:             0.1.4.1
+version:             0.1.5.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
+                       , relational-query >= 0.10
 
   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..678e5c2 100644
--- a/src/Database/Relational/Schema/DB2Syscat/Columns.hs
+++ b/src/Database/Relational/Schema/DB2Syscat/Columns.hs
@@ -16,7 +16,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..cb63c09 100644
--- a/src/Database/Relational/Schema/DB2Syscat/Keycoluse.hs
+++ b/src/Database/Relational/Schema/DB2Syscat/Keycoluse.hs
@@ -18,7 +18,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..38fc13b 100644
--- a/src/Database/Relational/Schema/DB2Syscat/Tabconst.hs
+++ b/src/Database/Relational/Schema/DB2Syscat/Tabconst.hs
@@ -17,7 +17,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..a708672 100644
--- a/src/Database/Relational/Schema/MySQLInfo/Columns.hs
+++ b/src/Database/Relational/Schema/MySQLInfo/Columns.hs
@@ -6,7 +6,7 @@ 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..dc3c7f5 100644
--- a/src/Database/Relational/Schema/MySQLInfo/KeyColumnUsage.hs
+++ b/src/Database/Relational/Schema/MySQLInfo/KeyColumnUsage.hs
@@ -6,7 +6,7 @@ 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..dd509c1 100644
--- a/src/Database/Relational/Schema/MySQLInfo/TableConstraints.hs
+++ b/src/Database/Relational/Schema/MySQLInfo/TableConstraints.hs
@@ -5,7 +5,7 @@
 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..131e58c 100644
--- a/src/Database/Relational/Schema/OracleDataDictionary/ConsColumns.hs
+++ b/src/Database/Relational/Schema/OracleDataDictionary/ConsColumns.hs
@@ -6,7 +6,7 @@ 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..31f41c4 100644
--- a/src/Database/Relational/Schema/OracleDataDictionary/Constraints.hs
+++ b/src/Database/Relational/Schema/OracleDataDictionary/Constraints.hs
@@ -5,7 +5,7 @@
 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..e2717c5 100644
--- a/src/Database/Relational/Schema/OracleDataDictionary/TabColumns.hs
+++ b/src/Database/Relational/Schema/OracleDataDictionary/TabColumns.hs
@@ -6,7 +6,7 @@ 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..6f5efb7 100644
--- a/src/Database/Relational/Schema/PgCatalog/PgAttribute.hs
+++ b/src/Database/Relational/Schema/PgCatalog/PgAttribute.hs
@@ -14,7 +14,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..4ee0310 100644
--- a/src/Database/Relational/Schema/PgCatalog/PgClass.hs
+++ b/src/Database/Relational/Schema/PgCatalog/PgClass.hs
@@ -14,7 +14,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..068321b 100644
--- a/src/Database/Relational/Schema/PgCatalog/PgConstraint.hs
+++ b/src/Database/Relational/Schema/PgCatalog/PgConstraint.hs
@@ -14,7 +14,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..263f207 100644
--- a/src/Database/Relational/Schema/PgCatalog/PgNamespace.hs
+++ b/src/Database/Relational/Schema/PgCatalog/PgNamespace.hs
@@ -14,7 +14,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..daba60f 100644
--- a/src/Database/Relational/Schema/PgCatalog/PgType.hs
+++ b/src/Database/Relational/Schema/PgCatalog/PgType.hs
@@ -14,7 +14,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..d16aabb 100644
--- a/src/Database/Relational/Schema/SQLServerSyscat/Columns.hs
+++ b/src/Database/Relational/Schema/SQLServerSyscat/Columns.hs
@@ -6,7 +6,7 @@ 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..29c9110 100644
--- a/src/Database/Relational/Schema/SQLServerSyscat/IndexColumns.hs
+++ b/src/Database/Relational/Schema/SQLServerSyscat/IndexColumns.hs
@@ -6,7 +6,7 @@ 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..8abab2b 100644
--- a/src/Database/Relational/Schema/SQLServerSyscat/Indexes.hs
+++ b/src/Database/Relational/Schema/SQLServerSyscat/Indexes.hs
@@ -6,7 +6,7 @@ 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..b6be33e 100644
--- a/src/Database/Relational/Schema/SQLServerSyscat/Types.hs
+++ b/src/Database/Relational/Schema/SQLServerSyscat/Types.hs
@@ -6,7 +6,7 @@ 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..1e233fd 100644
--- a/src/Database/Relational/Schema/SQLite3Syscat/IndexInfo.hs
+++ b/src/Database/Relational/Schema/SQLite3Syscat/IndexInfo.hs
@@ -6,7 +6,7 @@ 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..fe5b524 100644
--- a/src/Database/Relational/Schema/SQLite3Syscat/IndexList.hs
+++ b/src/Database/Relational/Schema/SQLite3Syscat/IndexList.hs
@@ -6,7 +6,7 @@ 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..6222685 100644
--- a/src/Database/Relational/Schema/SQLite3Syscat/TableInfo.hs
+++ b/src/Database/Relational/Schema/SQLite3Syscat/TableInfo.hs
@@ -6,7 +6,7 @@ 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)