added support for smallint and brought existing support for bigint (a…

…nd smallint) to the IDE
digitallyinduced · Jan 10, 2021 · 3b1c594 · 3b1c594
1 parent 2a206af
commit 3b1c594
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 deletions.
diff --git a/IHP/IDE/SchemaDesigner/Compiler.hs b/IHP/IDE/SchemaDesigner/Compiler.hs
@@ -87,6 +87,7 @@ compilePostgresType :: PostgresType -> Text
 compilePostgresType PUUID = "UUID"
 compilePostgresType PText = "TEXT"
 compilePostgresType PInt = "INT"
+compilePostgresType PSmallInt = "SMALLINT"
 compilePostgresType PBigInt = "BIGINT"
 compilePostgresType PBoolean = "BOOLEAN"
 compilePostgresType PTimestamp = "TIMESTAMP WITHOUT TIME ZONE"
@@ -358,4 +359,4 @@ compileIdentifier identifier = if identifierNeedsQuoting then tshow identifier e
             , "VARCHAR"
             ]
 
-indent text = "    " <> text
+indent text = "    " <> text
diff --git a/IHP/IDE/SchemaDesigner/Parser.hs b/IHP/IDE/SchemaDesigner/Parser.hs
@@ -187,8 +187,9 @@ sqlType :: Parser PostgresType
 sqlType = choice $ map optionalArray
         [ uuid
         , text
-        , bigint
+        , smallint
         , int
+        , bigint
         , bool
         , timestamp
         , timestampZ
@@ -234,6 +235,10 @@ sqlType = choice $ map optionalArray
                     try (symbol' "TEXT")
                     pure PText
 
+                smallint = do
+                    try (symbol' "SMALLINT") <|> try (symbol' "INT2")
+                    pure PSmallInt
+
                 int = do
                     try (symbol' "INTEGER") <|> try (symbol' "INT4") <|> try (symbol' "INT")
                     pure PInt

diff --git a/IHP/IDE/SchemaDesigner/Types.hs b/IHP/IDE/SchemaDesigner/Types.hs
@@ -79,6 +79,7 @@ data PostgresType
     = PUUID
     | PText
     | PInt
+    | PSmallInt
     | PBigInt
     | PBoolean
     | PTimestampWithTimezone

diff --git a/IHP/IDE/SchemaDesigner/View/Columns/Edit.hs b/IHP/IDE/SchemaDesigner/View/Columns/Edit.hs
@@ -114,7 +114,9 @@ typeSelector :: Maybe PostgresType -> [Text] -> Html
 typeSelector postgresType enumNames = [hsx|
         <select id="typeSelector" name="columnType" class="form-control select2-simple">
             {option selected "TEXT" "Text"}
-            {option selected "INT" "Int"}
+            {option selected "SMALLINT" "Int (16bit)"}
+            {option selected "INT" "Int (32bit)"}
+            {option selected "BIGINT" "Int (64bit)"}
             {option selected "UUID" "UUID"}
             {option selected "BOOLEAN" "Bool"}
             {option selected "TIMESTAMP WITH TIME ZONE" "Timestamp (UTCTime)"}

diff --git a/IHP/SchemaCompiler.hs b/IHP/SchemaCompiler.hs
@@ -53,6 +53,7 @@ previewCompilerOptions = CompilerOptions { compileGetAndSetFieldInstances = Fals
 
 atomicType :: PostgresType -> Text
 atomicType = \case
+    PSmallInt -> "Int"
     PInt -> "Int"
     PBigInt -> "Integer"
     PJSONB -> "Data.Aeson.Value"

diff --git a/Test/IDE/SchemaDesigner/ParserSpec.hs b/Test/IDE/SchemaDesigner/ParserSpec.hs
@@ -195,15 +195,17 @@ tests = do
         it "should parse CREATE TYPE .. AS ENUM without values" do
             parseSql "CREATE TYPE colors AS ENUM ();" `shouldBe` CreateEnumType { name = "colors", values = [] }
 
-        it "should parse a CREATE TABLE with INTEGER / INT / INT4 / BIGINT / INT 8 columns" do
-            parseSql "CREATE TABLE ints (int_a INTEGER, int_b INT, int_c int4, bigint_a BIGINT, bigint_b int8);" `shouldBe` StatementCreateTable CreateTable
+        it "should parse a CREATE TABLE with INTEGER / INT / INT4 / SMALLINT / INT2 / BIGINT / INT 8 columns" do
+            parseSql "CREATE TABLE ints (int_a INTEGER, int_b INT, int_c int4, bigint_a BIGINT, bigint_b int8, smallint_a SMALLINT, smallint_b INT2);" `shouldBe` StatementCreateTable CreateTable
                     { name = "ints"
                     , columns =
                         [ col { name = "int_a", columnType = PInt }
                         , col { name = "int_b", columnType = PInt }
                         , col { name = "int_c", columnType = PInt }
                         , col { name = "bigint_a", columnType = PBigInt }
                         , col { name = "bigint_b", columnType = PBigInt }
+                        , col { name = "smallint_a", columnType = PSmallInt }
+                        , col { name = "smallint_b", columnType = PSmallInt }
                         ]
                     , primaryKeyConstraint = PrimaryKeyConstraint []
                     , constraints = []