From 23c186ec6a6d307a80a2f1709a59b04bd52ae72a Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Thu, 25 Jul 2019 18:47:59 -0700 Subject: [PATCH 1/4] Ignore .spago directory --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7eab20b..eb8a887 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /.pulp-cache +/.spago /bower_components /node_modules /output From c11aa9be44daa8de869289edcd2af48273502558 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Thu, 25 Jul 2019 18:48:52 -0700 Subject: [PATCH 2/4] Convert project to Spago --- package.json | 15 ------ packages.dhall | 121 +++++++++++++++++++++++++++++++++++++++++++++++++ spago.dhall | 38 ++++++++++++++++ 3 files changed, 159 insertions(+), 15 deletions(-) delete mode 100644 package.json create mode 100644 packages.dhall create mode 100644 spago.dhall diff --git a/package.json b/package.json deleted file mode 100644 index a2f0885..0000000 --- a/package.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "purescript-postgresql-client", - "dependencies": { - "decimal.js": "^10.0.0", - "pg": "^6.1.2" - }, - "devDependencies": { - "paluh-litps": "^0.1.4", - "pulp": "^12.3.0" - }, - "scripts": { - "pretest": "paluh-litps compile --file README.md; mv README.purs test/README.purs", - "test": "pulp test" - } -} diff --git a/packages.dhall b/packages.dhall new file mode 100644 index 0000000..afd3739 --- /dev/null +++ b/packages.dhall @@ -0,0 +1,121 @@ +{- +Welcome to your new Dhall package-set! + +Below are instructions for how to edit this file for most use +cases, so that you don't need to know Dhall to use it. + +## Warning: Don't Move This Top-Level Comment! + +Due to how `dhall format` currently works, this comment's +instructions cannot appear near corresponding sections below +because `dhall format` will delete the comment. However, +it will not delete a top-level comment like this one. + +## Use Cases + +Most will want to do one or both of these options: +1. Override/Patch a package's dependency +2. Add a package not already in the default package set + +This file will continue to work whether you use one or both options. +Instructions for each option are explained below. + +### Overriding/Patching a package + +Purpose: +- Change a package's dependency to a newer/older release than the + default package set's release +- Use your own modified version of some dependency that may + include new API, changed API, removed API by + using your custom git repo of the library rather than + the package set's repo + +Syntax: +Replace the overrides' "{=}" (an empty record) with the following idea +The "//" or "⫽" means "merge these two records and + when they have the same value, use the one on the right:" +------------------------------- +let override = + { packageName = + upstream.packageName // { updateEntity1 = "new value", updateEntity2 = "new value" } + , packageName = + upstream.packageName // { version = "v4.0.0" } + , packageName = + upstream.packageName // { repo = "https://www.example.com/path/to/new/repo.git" } + } +------------------------------- + +Example: +------------------------------- +let overrides = + { halogen = + upstream.halogen // { version = "master" } + , halogen-vdom = + upstream.halogen-vdom // { version = "v4.0.0" } + } +------------------------------- + +### Additions + +Purpose: +- Add packages that aren't already included in the default package set + +Syntax: +Replace the additions' "{=}" (an empty record) with the following idea: +------------------------------- +let additions = + { "package-name" = + mkPackage + [ "dependency1" + , "dependency2" + ] + "https://example.com/path/to/git/repo.git" + "tag ('v4.0.0') or branch ('master')" + , "package-name" = + mkPackage + [ "dependency1" + , "dependency2" + ] + "https://example.com/path/to/git/repo.git" + "tag ('v4.0.0') or branch ('master')" + , etc. + } +------------------------------- + +Example: +------------------------------- +let additions = + { benchotron = + mkPackage + [ "arrays" + , "exists" + , "profunctor" + , "strings" + , "quickcheck" + , "lcg" + , "transformers" + , "foldable-traversable" + , "exceptions" + , "node-fs" + , "node-buffer" + , "node-readline" + , "datetime" + , "now" + ] + "https://github.com/hdgarrood/purescript-benchotron.git" + "v7.0.0" + } +------------------------------- +-} + +let mkPackage = + https://raw.githubusercontent.com/purescript/package-sets/psc-0.13.2-20190725/src/mkPackage.dhall sha256:0b197efa1d397ace6eb46b243ff2d73a3da5638d8d0ac8473e8e4a8fc528cf57 + +let upstream = + https://raw.githubusercontent.com/purescript/package-sets/psc-0.13.2-20190725/src/packages.dhall sha256:60cc03d2c3a99a0e5eeebb16a22aac219fa76fe6a1686e8c2bd7a11872527ea3 + +let overrides = {=} + +let additions = {=} + +in upstream // overrides // additions diff --git a/spago.dhall b/spago.dhall new file mode 100644 index 0000000..f8b9973 --- /dev/null +++ b/spago.dhall @@ -0,0 +1,38 @@ +{- +Welcome to a Spago project! +You can edit this file as you like. +-} +{ name = + "my-project" +, dependencies = + [ "aff" + , "arrays" + , "assert" + , "bifunctors" + , "bytestrings" + , "console" + , "datetime" + , "decimals" + , "effect" + , "either" + , "exceptions" + , "foldable-traversable" + , "foreign" + , "foreign-generic" + , "foreign-object" + , "js-date" + , "lists" + , "maybe" + , "newtype" + , "nullable" + , "prelude" + , "psci-support" + , "test-unit" + , "transformers" + , "tuples" + ] +, packages = + ./packages.dhall +, sources = + [ "src/**/*.purs", "test/**/*.purs" ] +} From d184c78e243cad892d805c366ca065f62cffac70 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Thu, 25 Jul 2019 18:51:19 -0700 Subject: [PATCH 3/4] Ignore psc-* files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index eb8a887..aa51a80 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /.pulp-cache /.spago +/.psc-* /bower_components /node_modules /output From fa843a350f297f73dda8ca7fe50b39e52f2660d0 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Thu, 25 Jul 2019 19:01:21 -0700 Subject: [PATCH 4/4] Update API due to breaking change --- src/Database/PostgreSQL/Value.purs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Database/PostgreSQL/Value.purs b/src/Database/PostgreSQL/Value.purs index a4088a0..98bc674 100644 --- a/src/Database/PostgreSQL/Value.purs +++ b/src/Database/PostgreSQL/Value.purs @@ -26,7 +26,7 @@ import Data.String (Pattern(..), split) import Data.Time.Duration (Milliseconds(..)) import Data.Traversable (sequence, traverse) import Foreign (Foreign, ForeignError(..), MultipleErrors, isNull, readArray, readBoolean, readChar, readInt, readNumber, readString, renderForeignError, unsafeFromForeign, unsafeToForeign) -import Foreign.Internal (readObject) +import Foreign.Generic.Internal (readObject) import Foreign.Object (Object) -- | Convert things to SQL values.