Added test cases for not null and unique

Author: tusharad

README.md

@@ -74,6 +74,10 @@ stack run -- test.sql -o erd.svg
 - [ ] Add Additional Examples
 - [ ] Add more parsing functions
 - [ ] Add more documentation
+- [x] Adding test cases
+- [ ] Adding support for interval data type
+- [x] GENERATED constraint
+- [ ] Parse 2D array
 
 See the [open issues](https://github.com/tusharad/sql2er/issues) for a full list of proposed features (and known issues).
 
@@ -93,7 +97,7 @@ See the [open issues](https://github.com/tusharad/sql2er/issues) for a full list
 - tablespace
 - not valid
 - validate
-- begin/commit
+- interval data type
 
 <!-- ACKNOWLEDGMENTS -->
 ## Acknowledgments
@@ -117,4 +121,4 @@ See the [open issues](https://github.com/tusharad/sql2er/issues) for a full list
 [linkedin-shield]: https://img.shields.io/badge/-LinkedIn-black.svg?style=for-the-badge&logo=linkedin&colorB=555
 [linkedin-url]: https://linkedin.com/in/tushar-adhatrao
 [Haskell]: https://img.shields.io/badge/Haskell-5e5086?style=for-the-badge&logo=haskell&logoColor=white
-[Haskell-url]: https://www.haskell.org/
+[Haskell-url]: https://www.haskell.org/

example/test.sql

@@ -76,14 +76,22 @@ CREATE TABLE query_categories (
   updated_at TIMESTAMP DEFAULT NOW()
 );
 
+CREATE TABLE films (
+    code        char(5) CONSTRAINT firstkey PRIMARY KEY,
+    title       varchar(40) NOT NULL,
+    did         integer NOT NULL,
+    date_prod   date,
+    kind        varchar(10)
+);
+
 CREATE TABLE faqs (
-  faq_id SERIAL PRIMARY KEY, 
+  faq_id SERIAL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, 
   faq TEXT NOT NULL, 
   -- freq INTEGER NOT NULL DEFAULT 0 CONSTRAINT chk_positive CHECK (freq >= 0),
   coverage_percentage Integer,
   coverage_description text,
   created_at timestamp DEFAULT now(),
-  updated_at timestamp DEFAULT now()
+  updated_at timestamp DEFAULT now() GENERATED BY DEFAULT AS IDENTITY
 );
 
 CREATE TABLE sop_gap_coverage (

src/Sql2er/Common/Types.hs

@@ -30,7 +30,7 @@ data SqlType
   | PGboolean
   | PGbox
   | PGbytea
-  | PGchar
+  | PGchar (Maybe Int)
   | PGvarchar (Maybe Int)
   | PGdate
   | PGinteger

src/Sql2er/Parser/Common.hs

@@ -119,6 +119,13 @@ parseReferenceForCol = do
           *> takeWhile1P Nothing (`notElem` (" \t\n;,)" :: String))
   return (ReferencesColumn refTable refCol)
 
+ignoreConstraints :: Parser ()
+ignoreConstraints = do
+  _ <-
+    lexeme (string "generated")
+      *> lexeme (takeWhile1P Nothing (`notElem` (",);" :: String)))
+  return ()
+
 parseSqlType :: Parser SqlType
 parseSqlType =
   choice $
@@ -134,9 +141,13 @@ parseSqlType =
           , PGbytea
               <$ string "bytea"
           , PGchar
-              <$ string "char"
+              <$> ( string "char"
+                      *> optional (space *> lexeme (char '(') *> decimal <* char ')')
+                  )
           , PGvarchar
-              <$> (string "varchar" *> optional (space *> lexeme (char '(') *> decimal <* char ')'))
+              <$> ( string "varchar"
+                      *> optional (space *> lexeme (char '(') *> decimal <* char ')')
+                  )
           , PGdate
               <$ string "date"
           , PGinteger

src/Sql2er/Parser/CreateTable.hs

@@ -29,6 +29,7 @@ parseColumn = do
                     , parseReferenceForCol
                     , parseNullForCol 
                     ]))
+  void $ optional ignoreConstraints
   return
     Column
       { columnName = cName

test/ExamplesForTests.hs

@@ -13,17 +13,54 @@ simpleTable1String =
   \did         integer NOT NULL,\
   \date_prod   date,\
   \kind        varchar(10),\
-  \len         interval hour to minute\
   \);"
 
+uniqueConstraint :: Table
+uniqueConstraint =
+  Table
+    { tableName = "x"
+    , columns =
+        [ Column
+            { columnName = "y"
+            , columnType = PGvarchar (Just 3)
+            , cConstraints = [Unique]
+            }
+        , Column
+            { columnName = "z"
+            , columnType = PGinteger
+            , cConstraints = []
+            }
+        ]
+    , tableConstraints = [UniqueConstraint ["z"]]
+    }
+
+columnNullNotNull :: Table
+columnNullNotNull =
+  Table
+    { tableName = "x"
+    , columns =
+        [ Column
+            { columnName = "y"
+            , columnType = PGvarchar (Just 3)
+            , cConstraints = [NotNull]
+            }
+        , Column
+            { columnName = "z"
+            , columnType = PGinteger
+            , cConstraints = [Null]
+            }
+        ]
+    , tableConstraints = []
+    }
+
 constraintNamePK :: Table
 constraintNamePK =
   Table
     { tableName = "x"
     , columns =
         [ Column
             { columnName = "y"
-            , columnType = PGinteger
+            , columnType = PGvarchar (Just 3)
             , cConstraints = [PrimaryKey]
             }
         , Column

test/Spec.hs

@@ -6,13 +6,25 @@ import Data.Text qualified as T
 import Data.Text.IO qualified as T
 import ExamplesForTests
 import ExamplesForTests qualified as Ex
+import Sql2er.Common.Types
 import Sql2er.Common.Utils (begin, commit, rollback)
 import Sql2er.Parser
 import Sql2er.Parser.CreateTable (parseCreateTable)
 import Test.Tasty
 import Test.Tasty.HUnit
 import Text.Megaparsec
 
+testParse :: Text -> Parser Table -> Table -> String -> Assertion
+testParse inputText parsingFunc expectedOp failureMsg = do
+  let eRes =
+        runParser
+          parsingFunc
+          ""
+          inputText
+  case eRes of
+    Left _ -> assertFailure failureMsg
+    Right r -> expectedOp @=? r
+
 testBeginCommit :: TestTree
 testBeginCommit =
   testGroup
@@ -47,19 +59,36 @@ testColumnConstraint :: TestTree
 testColumnConstraint =
   testGroup
     "column constraints"
-    [ testCase "column with constraint name" $ do
-        let eRes =
-              runParser
-                parseCreateTable
-                ""
+    [ testCase "column with constraint name" $
+        testParse
+           ( T.toLower
+            "create or replace \
+            \table x (y varchar(3) CONSTRAINT \
+            \cName primary key, z int)")
+            parseCreateTable
+            Ex.constraintNamePK
+            "parsing failed for column constraint"
+    , testCase "column with Null and Not Null constraints" $
+        testParse
                 ( T.toLower
                     "create or replace \
-                    \table x (y int CONSTRAINT \
-                    \cName primary key, z int)"
+                    \table x (y varchar(3) Not NULL\
+                    \, z int NULL)"
                 )
-        case eRes of
-          Left _ -> assertFailure "parsing failed for column constraint"
-          Right r -> Ex.constraintNamePK @=? r
+                parseCreateTable
+                Ex.columnNullNotNull
+                "parsing failed for column NULL, not NULL"
+    , testCase "column with unique constraint" $
+        testParse
+          ( T.toLower
+              "create or replace \
+              \table x (y varchar(3) unique\
+              \, z int\
+              \, constraint zUnique unique (z))"
+          )
+          parseCreateTable
+          Ex.uniqueConstraint 
+          "parsing failed for unique column constraint"
     ]
 
 createStatementTests :: TestTree