Signed Int readParam bugfix and a few other minor additions

digitallyinduced · Nov 13, 2020 · 68afa80 · 68afa80
1 parent 4262eb2
commit 68afa80
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/Guide/installation.markdown b/Guide/installation.markdown
@@ -64,7 +64,7 @@ With the Distro downloaded, run it and update it using your package manager. In
 ```bash
 sudo apt update
 sudo apt upgrade
-sudo apt install git curl make -y
+sudo apt install git curl make xdg-utils -y
 ```
 
 WSL will add your Windows System Paths in your Linux Subsystem. These tend to generate errors due to spaces and brackets in folder names. Also, due to Linux not loading the `.profile`, we need to add the nix.sh manually. To fix these two issues, just add these lines to the end of your `.bashrc`
@@ -102,6 +102,8 @@ When using Windows, you will be asked if tasks like ghc-iserv or rundevserver sh
 
 Installing nix for IHP was done using [this guide](https://nathan.gs/2019/04/12/nix-on-windows/).
 
+Note that nix can gradually grow to use several GB of disk space, especially after upgrading IHP. You can always run `nix-collect-garbage` in a `nix-shell` which will delete older/unused files.
+
 ## 2. Installing IHP
 
 You can now install IHP by running:

diff --git a/IHP/Controller/Param.hs b/IHP/Controller/Param.hs
@@ -261,7 +261,7 @@ instance ParamReader ByteString where
 instance ParamReader Int where
     {-# INLINE readParameter #-}
     readParameter byteString =
-        case Attoparsec.parseOnly (Attoparsec.decimal <* Attoparsec.endOfInput) byteString of
+        case Attoparsec.parseOnly ((Attoparsec.signed Attoparsec.decimal) <* Attoparsec.endOfInput) byteString of
             Right value -> Right value
             Left error -> Left ("ParamReader Int: " <> cs error)
 
@@ -274,7 +274,7 @@ instance ParamReader Int where
 instance ParamReader Integer where
     {-# INLINE readParameter #-}
     readParameter byteString =
-        case Attoparsec.parseOnly (Attoparsec.decimal <* Attoparsec.endOfInput) byteString of
+        case Attoparsec.parseOnly ((Attoparsec.signed Attoparsec.decimal) <* Attoparsec.endOfInput) byteString of
             Right value -> Right value
             Left error -> Left ("ParamReader Int: " <> cs error)
 

diff --git a/IHP/IDE/SchemaDesigner/View/Columns/Edit.hs b/IHP/IDE/SchemaDesigner/View/Columns/Edit.hs
@@ -126,6 +126,7 @@ typeSelector postgresType enumNames = [hsx|
             {option selected "Time" "Time"}
             {option selected "SERIAL" "Serial"}
             {option selected "BIGSERIAL" "Bigserial"}
+            {option selected "JSONB" "JSON"}
             {forEach enumNames renderEnumType}
         </select>
 |]

diff --git a/lib/IHP/static/ihp-schemadesigner.js b/lib/IHP/static/ihp-schemadesigner.js
@@ -67,6 +67,12 @@ function initSchemaDesigner() {
                 .append(new Option("no default", "", false, false))
                 .trigger('change');
                 break;
+            case "TIMESTAMP WITHOUT TIME ZONE":
+                $('#defaultSelector').empty()
+                .append(new Option("NOW()", 'NOW()', true, true))
+                .append(new Option("no default", "", false, false))
+                .trigger('change');
+                break;
             case "TEXT":
                 $('#defaultSelector').empty()
                 .append(new Option("no default", "", true, true))