diff --git a/ChangeLog.md b/ChangeLog.md --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,9 @@ +## 0.7.2.0 + +- apply new module names of relational-schema. + ## 0.7.1.1 - fix build for old GHCs. diff --git a/relational-query-HDBC.cabal b/relational-query-HDBC.cabal --- a/relational-query-HDBC.cabal +++ b/relational-query-HDBC.cabal @@ -1,8 +1,9 @@ name: relational-query-HDBC -version: 0.7.1.1 +version: 0.7.2.0 synopsis: HDBC instance of relational-query and typed query interface for HDBC description: This package contains the HDBC instance of relational-query and the typed query interface for HDBC. + . Generating Database table definitions and functions for relational-query by reading table and index definitions from Database system catalogs. @@ -11,11 +12,12 @@ license-file: LICENSE author: Kei Hibino, Shohei Murayama, Shohei Yasutake, Sho KURODA maintainer: ex8k.hibino@gmail.com, shohei.murayama@gmail.com, amutake.s@gmail.com, krdlab@gmail.com -copyright: Copyright (c) 2013-2018 Kei Hibino, Shohei Murayama, Shohei Yasutake, Sho KURODA +copyright: Copyright (c) 2013-2019 Kei Hibino, 2013 Shohei Murayama, 2013 Shohei Yasutake, 2013 Sho KURODA category: Database build-type: Simple cabal-version: >=1.10 -tested-with: GHC == 8.4.1, GHC == 8.4.2, GHC == 8.4.3 +tested-with: GHC == 8.6.1, GHC == 8.6.2, GHC == 8.6.3, GHC == 8.6.4, GHC == 8.6.5 + , GHC == 8.4.1, GHC == 8.4.2, GHC == 8.4.3, GHC == 8.4.4 , GHC == 8.2.1, GHC == 8.2.2 , GHC == 8.0.1, GHC == 8.0.2 , GHC == 7.10.1, GHC == 7.10.2, GHC == 7.10.3 @@ -62,13 +64,15 @@ , names-th , sql-words , persistable-record >= 0.6 - , relational-query >= 0.12 - , relational-schemas + , relational-query >= 0.12.2 + , relational-schemas >= 0.1.7 , HDBC >=2 , HDBC-session hs-source-dirs: src ghc-options: -Wall + if impl(ghc >= 8) + ghc-options: -Wcompat -Wnoncanonical-monadfail-instances default-language: Haskell2010 @@ -83,6 +87,9 @@ main-is: convertibleIso.hs hs-source-dirs: test ghc-options: -Wall + if impl(ghc >= 8) + ghc-options: -Wcompat -Wnoncanonical-monadfail-instances + default-language: Haskell2010 source-repository head diff --git a/src/Database/HDBC/Query/TH.hs b/src/Database/HDBC/Query/TH.hs --- a/src/Database/HDBC/Query/TH.hs +++ b/src/Database/HDBC/Query/TH.hs @@ -43,7 +43,7 @@ import Database.Record.TH (recordTemplate, defineSqlPersistableInstances) import Database.Relational (Config, nameConfig, recordConfig, enableWarning, verboseAsCompilerWarning, - defaultConfig, Relation, relationalQuerySQL, QuerySuffix) + defaultConfig, Relation, untypeQuery, relationalQuery_, QuerySuffix) import qualified Database.Relational.TH as Relational import Database.HDBC.Session (withConnectionIO) @@ -181,7 +181,7 @@ -> Q [Dec] -- ^ Result declarations inlineVerifiedQuery connect relVar rel config sufs qns = do (p, r) <- Relational.reifyRelation relVar - let sql = relationalQuerySQL config rel sufs + let sql = untypeQuery $ relationalQuery_ config rel sufs when (verboseAsCompilerWarning config) . reportWarning $ "Verify with prepare: " ++ sql void . runIO $ withConnectionIO connect (\conn -> prepare conn sql) Relational.unsafeInlineQuery (return p) (return r) sql (varCamelcaseName qns) diff --git a/src/Database/HDBC/Schema/IBMDB2.hs b/src/Database/HDBC/Schema/IBMDB2.hs --- a/src/Database/HDBC/Schema/IBMDB2.hs +++ b/src/Database/HDBC/Schema/IBMDB2.hs @@ -4,7 +4,7 @@ -- | -- Module : Database.HDBC.Schema.IBMDB2 --- Copyright : 2013-2017 Kei Hibino +-- Copyright : 2013-2019 Kei Hibino -- License : BSD3 -- -- Maintainer : ex8k.hibino@gmail.com @@ -38,9 +38,9 @@ import Database.Relational.Schema.IBMDB2 (normalizeColumn, notNull, getType, columnsQuerySQL, primaryKeyQuerySQL) -import Database.Relational.Schema.DB2Syscat.Columns (Columns) -import qualified Database.Relational.Schema.DB2Syscat.Columns as Columns -import Database.Relational.Schema.DB2Syscat.Config (config) +import Database.Relational.Schema.IBMDB2.Columns (Columns) +import qualified Database.Relational.Schema.IBMDB2.Columns as Columns +import Database.Relational.Schema.IBMDB2 (config) import Database.HDBC.Schema.Driver (TypeMap, LogChan, putVerbose, failWith, maybeIO, hoistMaybe, diff --git a/src/Database/HDBC/Schema/MySQL.hs b/src/Database/HDBC/Schema/MySQL.hs --- a/src/Database/HDBC/Schema/MySQL.hs +++ b/src/Database/HDBC/Schema/MySQL.hs @@ -4,7 +4,7 @@ -- | -- Module : Database.HDBC.Schema.MySQL --- Copyright : 2013 Sho KURODA, 2017 Kei Hibiono +-- Copyright : 2013 Sho KURODA, 2017-2019 Kei Hibiono -- License : BSD3 -- -- Maintainer : krdlab@gmail.com @@ -48,9 +48,9 @@ , primaryKeyQuerySQL ) -import Database.Relational.Schema.MySQLInfo.Columns (Columns) -import qualified Database.Relational.Schema.MySQLInfo.Columns as Columns -import Database.Relational.Schema.MySQLInfo.Config (config) +import Database.Relational.Schema.MySQL.Columns (Columns) +import qualified Database.Relational.Schema.MySQL.Columns as Columns +import Database.Relational.Schema.MySQL (config) instance FromSql SqlValue Columns diff --git a/src/Database/HDBC/Schema/Oracle.hs b/src/Database/HDBC/Schema/Oracle.hs --- a/src/Database/HDBC/Schema/Oracle.hs +++ b/src/Database/HDBC/Schema/Oracle.hs @@ -3,7 +3,7 @@ -- | -- Module : Database.HDBC.Schema.Oracle --- Copyright : 2013 Shohei Yasutake, 2017 Kei Hibiono +-- Copyright : 2013 Shohei Yasutake, 2017-2019 Kei Hibiono -- License : BSD3 -- -- Maintainer : amutake.s@gmail.com @@ -36,9 +36,9 @@ ( normalizeColumn, notNull, getType , columnsQuerySQL, primaryKeyQuerySQL ) -import Database.Relational.Schema.OracleDataDictionary.TabColumns (DbaTabColumns) -import qualified Database.Relational.Schema.OracleDataDictionary.TabColumns as Cols -import Database.Relational.Schema.OracleDataDictionary.Config (config) +import Database.Relational.Schema.Oracle.TabColumns (DbaTabColumns) +import qualified Database.Relational.Schema.Oracle.TabColumns as Cols +import Database.Relational.Schema.Oracle (config) instance FromSql SqlValue DbaTabColumns diff --git a/src/Database/HDBC/Schema/PostgreSQL.hs b/src/Database/HDBC/Schema/PostgreSQL.hs --- a/src/Database/HDBC/Schema/PostgreSQL.hs +++ b/src/Database/HDBC/Schema/PostgreSQL.hs @@ -4,7 +4,7 @@ -- | -- Module : Database.HDBC.Schema.PostgreSQL --- Copyright : 2013-2017 Kei Hibino +-- Copyright : 2013-2019 Kei Hibino -- License : BSD3 -- -- Maintainer : ex8k.hibino@gmail.com @@ -36,10 +36,10 @@ import Database.Relational.Schema.PostgreSQL (normalizeColumn, notNull, getType, columnQuerySQL, primaryKeyLengthQuerySQL, primaryKeyQuerySQL) -import Database.Relational.Schema.PgCatalog.PgAttribute (PgAttribute) -import Database.Relational.Schema.PgCatalog.PgType (PgType) -import qualified Database.Relational.Schema.PgCatalog.PgType as Type -import Database.Relational.Schema.PgCatalog.Config (config) +import Database.Relational.Schema.PostgreSQL.PgAttribute (PgAttribute) +import Database.Relational.Schema.PostgreSQL.PgType (PgType) +import qualified Database.Relational.Schema.PostgreSQL.PgType as Type +import Database.Relational.Schema.PostgreSQL (config) import Database.HDBC.Schema.Driver (TypeMap, LogChan, putVerbose, failWith, maybeIO, hoistMaybe, diff --git a/src/Database/HDBC/Schema/SQLServer.hs b/src/Database/HDBC/Schema/SQLServer.hs --- a/src/Database/HDBC/Schema/SQLServer.hs +++ b/src/Database/HDBC/Schema/SQLServer.hs @@ -4,7 +4,7 @@ -- | -- Module : Database.HDBC.Schema.SQLServer --- Copyright : 2013 Shohei Murayama, 2017 Kei Hibiono +-- Copyright : 2013 Shohei Murayama, 2017-2019 Kei Hibiono -- License : BSD3 -- -- Maintainer : shohei.murayama@gmail.com @@ -14,8 +14,8 @@ driverSQLServer, ) where -import qualified Database.Relational.Schema.SQLServerSyscat.Columns as Columns -import qualified Database.Relational.Schema.SQLServerSyscat.Types as Types +import qualified Database.Relational.Schema.SQLServer.Columns as Columns +import qualified Database.Relational.Schema.SQLServer.Types as Types import Control.Applicative ((<$>), (<|>)) import Control.Monad (guard) @@ -32,9 +32,9 @@ import Database.Record (FromSql, ToSql) import Database.Relational.Schema.SQLServer (columnTypeQuerySQL, getType, normalizeColumn, notNull, primaryKeyQuerySQL) -import Database.Relational.Schema.SQLServerSyscat.Columns (Columns) -import Database.Relational.Schema.SQLServerSyscat.Types (Types) -import Database.Relational.Schema.SQLServerSyscat.Config (config) +import Database.Relational.Schema.SQLServer.Columns (Columns) +import Database.Relational.Schema.SQLServer.Types (Types) +import Database.Relational.Schema.SQLServer (config) import Language.Haskell.TH (TypeQ) diff --git a/src/Database/HDBC/Schema/SQLite3.hs b/src/Database/HDBC/Schema/SQLite3.hs --- a/src/Database/HDBC/Schema/SQLite3.hs +++ b/src/Database/HDBC/Schema/SQLite3.hs @@ -4,7 +4,7 @@ -- | -- Module : Database.HDBC.Schema.SQLite3 --- Copyright : 2013 Shohei Murayama, 2017 Kei Hibiono +-- Copyright : 2013 Shohei Murayama, 2017-2019 Kei Hibiono -- License : BSD3 -- -- Maintainer : shohei.murayama@gmail.com @@ -14,9 +14,9 @@ driverSQLite3 ) where -import qualified Database.Relational.Schema.SQLite3Syscat.IndexInfo as IndexInfo -import qualified Database.Relational.Schema.SQLite3Syscat.IndexList as IndexList -import qualified Database.Relational.Schema.SQLite3Syscat.TableInfo as TableInfo +import qualified Database.Relational.Schema.SQLite3.IndexInfo as IndexInfo +import qualified Database.Relational.Schema.SQLite3.IndexList as IndexList +import qualified Database.Relational.Schema.SQLite3.TableInfo as TableInfo import Control.Applicative ((<|>)) import Control.Monad (guard) @@ -33,10 +33,10 @@ import Database.Record (FromSql, ToSql) import Database.Relational.Schema.SQLite3 (getType, indexInfoQuerySQL, indexListQuerySQL, normalizeColumn, normalizeType, notNull, tableInfoQuerySQL) -import Database.Relational.Schema.SQLite3Syscat.IndexInfo (IndexInfo) -import Database.Relational.Schema.SQLite3Syscat.IndexList (IndexList) -import Database.Relational.Schema.SQLite3Syscat.TableInfo (TableInfo) -import Database.Relational.Schema.SQLite3Syscat.Config (config) +import Database.Relational.Schema.SQLite3.IndexInfo (IndexInfo) +import Database.Relational.Schema.SQLite3.IndexList (IndexList) +import Database.Relational.Schema.SQLite3.TableInfo (TableInfo) +import Database.Relational.Schema.SQLite3 (config) import Language.Haskell.TH (TypeQ)