hasqlator-mysql 0.0.4 → 0.0.5

raw patch · 2 files changed

+19/−10 lines, 2 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• hasqlator-mysql.cabal +1/−1
• src/Database/MySQL/Hasqlator/Typed/Schema.hs +18/−9

@@ -1,5 +1,5 @@ Name:		hasqlator-mysql-Version: 	0.0.4+Version: 	0.0.5 Synopsis:	composable SQL generation Category: 	Database Copyright: 	Kristof Bastiaensen (2020)

@@ -290,9 +290,17 @@ getColumnTableName :: Properties -> ColumnInfo -> String getColumnTableName Properties{includeSchema}                    ColumnInfo{columnTableSchema, columnTableName}-  | includeSchema = Text.unpack columnTableSchema <> Text.unpack columnTableName+  | includeSchema = Text.unpack columnTableSchema <> "." <>+                    Text.unpack columnTableName   | otherwise = Text.unpack columnTableName           +getTableName :: Properties -> TableInfo -> String+getTableName Properties{includeSchema}+             TableInfo{tableSchema, tableName}+  | includeSchema = Text.unpack tableSchema <> "." <>+                    Text.unpack tableName+  | otherwise = Text.unpack tableName+           makeField :: Properties -> Name -> ColumnInfo -> Q [Dec] makeField props dbName ci@ColumnInfo{columnName                                     ,columnNullable} =@@ -334,7 +342,8 @@              []            ]   where tableString-          | includeSchema = Text.unpack tableSchema <> Text.unpack tableName+          | includeSchema = Text.unpack tableSchema <> "." <>+                            Text.unpack tableName           | otherwise = Text.unpack tableName             fieldClass :: Properties -> Name -> String -> Q Dec@@ -381,7 +390,7 @@   Nothing   [recC (mkName typeName) $ map columnTypes $ tableColumns ti ]   []-  where typeName = insertorTypeModifier props $ Text.unpack $ tableName ti+  where typeName = insertorTypeModifier props $ getTableName props ti         columnTypes ci =           ( mkName $ insertorFieldModifier props $ Text.unpack $ columnName ci           , Bang NoSourceUnpackedness NoSourceStrictness@@ -393,7 +402,7 @@   sequence [ sigD              insertorName              [t| T.Insertor-                 $(litT $ strTyLit $ Text.unpack $ tableName ti)+                 $(litT $ strTyLit $ getTableName props ti)                  $(conT dbName)                  $(conT insertorTypeName)                  |]@@ -403,15 +412,15 @@              []            ]   where -    insertorName = mkName $ insertorNameModifier props $ Text.unpack $-                   tableName ti-    insertorTypeName = mkName $ insertorTypeModifier props $ Text.unpack $-                       tableName ti+    insertorName = mkName $ insertorNameModifier props $ getTableName props ti+    insertorTypeName = mkName $ insertorTypeModifier props $+                       getTableName props ti      insertorField :: ColumnInfo -> Q Exp     insertorField ci = [e| $(sigE                              (varE $ mkName $ insertorFieldModifier props $                               Text.unpack $ columnName ci)-                             [t| $(conT insertorTypeName) -> $(columnTHType False ci)  |])+                             [t| $(conT insertorTypeName) ->+                                 $(columnTHType False ci)  |])                            `T.into`                            $(varE $ mkName $ fieldNameModifier props $                              Text.unpack $ columnName ci) |]