From 3faf4ff82e1f3a53175ad813849c2e9047930d7f Mon Sep 17 00:00:00 2001 From: Abhinav Sarkar Date: Sun, 24 Apr 2016 16:47:53 +0530 Subject: [PATCH] Updates hssqlppp to version 0.6.0. --- .gitmodules | 2 +- lib/hssqlppp | 2 +- ringo.cabal | 2 +- src/Ringo/Generator/Create.hs | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index bdf993c..0d863e5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "lib/hssqlppp"] path = lib/hssqlppp - url = https://github.com/abhin4v/hssqlppp + url = https://github.com/JakeWheat/hssqlppp.git diff --git a/lib/hssqlppp b/lib/hssqlppp index 3e0f0d0..5f7ff2c 160000 --- a/lib/hssqlppp +++ b/lib/hssqlppp @@ -1 +1 @@ -Subproject commit 3e0f0d0067799701d4176643e368a8c43a521ed9 +Subproject commit 5f7ff2c64e56c42acfd1623fae68e4424c85bac7 diff --git a/ringo.cabal b/ringo.cabal index 9001d97..835eb76 100644 --- a/ringo.cabal +++ b/ringo.cabal @@ -33,7 +33,7 @@ library containers >=0.5 && <0.6, mtl >=2.1 && <2.3, raw-strings-qq >=1.0 && <1.2, - hssqlppp ==0.5.23 + hssqlppp ==0.6.0 ghc-options: -Wall -Werror -fwarn-incomplete-uni-patterns -fno-warn-unused-do-bind -fno-warn-orphans -funbox-strict-fields -O2 default-language: Haskell2010 diff --git a/src/Ringo/Generator/Create.hs b/src/Ringo/Generator/Create.hs index 0f34e70..1342bcd 100644 --- a/src/Ringo/Generator/Create.hs +++ b/src/Ringo/Generator/Create.hs @@ -13,7 +13,8 @@ import Control.Applicative ((<$>)) import Control.Monad.Reader (Reader, asks, withReader) import Database.HsSqlPpp.Syntax ( Statement(..), RowConstraint(..), AlterTableAction(..) - , AlterTableOperation(..), Constraint(..), Cascade(..) ) + , AlterTableOperation(..), Constraint(..), Cascade(..) + , Replace(..) ) import Data.Maybe (listToMaybe, maybeToList) import Data.Monoid ((<>)) import Data.Text (Text) @@ -28,7 +29,7 @@ tableDefnStmts Table {..} = withReader envView $ do Settings {..} <- asks envSettings let tabName = tableName <> settingTableNameSuffixTemplate - tableSQL = CreateTable ea (name tabName) (map columnDefnSQL tableColumns) [] Nothing + tableSQL = CreateTable ea (name tabName) (map columnDefnSQL tableColumns) [] Nothing NoReplace columnDefnSQL Column {..} = attDef columnName columnType $ nullableDefnSQL columnNullable