Gracefully ignore parition

Author: tusharad

README.md

@@ -78,7 +78,8 @@ stack run -- test.sql -o erd.svg
 - [ ] Adding support for interval data type
 - [x] GENERATED constraint
 - [ ] Parse 2D array
-- [ ] Gracefully ignore partition.
+- [x] Gracefully ignore partition.
+- [ ] bigserial
 
 See the [open issues](https://github.com/tusharad/sql2er/issues) for a full list of proposed features (and known issues).
 

example/erd.svg

@@ -1,16 +1,10 @@
 BEGIN;
 
-CREATE TABLE orders (
-    order_id     bigint not null,
-    cust_id      bigint not null,
-    status       text
-);
-
 CREATE TABLE cities (
-    city_id      bigserial not null,
+    city_id      int not null,
     name         text not null,
     population   bigint
-) PARTITION BY LIST (left(lower(name), 1));
+) partition by (logdate);
 
 CREATE TABLE emails (
   email_record_id SERIAL PRIMARY KEY,

example/test.sql

@@ -40,6 +40,7 @@ data SqlType
   | PGint
   | PGtimestamp
   | PGtimestamptz
+  | PGBigSerial
   | SomeType
   deriving (Show, Eq)
 

src/Sql2er/Common/Types.hs

@@ -195,5 +195,7 @@ parseSqlType =
                     *> lexeme (string "time")
                     *> lexeme (string "zone")
                 )
+          , PGbigInt <$ string "bigint"
+          , PGBigSerial <$ string "bigserial"
           , SomeType <$ lexeme (takeWhile1P Nothing (/= ' '))
           ]

src/Sql2er/Parser/Common.hs

@@ -13,24 +13,34 @@ parseColumn :: Parser Column
 parseColumn = do
   cName <- parseWordAndComma
   sqlType <- lexeme parseSqlType
-  c <- many $ choice $ try <$> [
-                      parsePrimaryKeyForCol
+  c <-
+    many $
+      choice $
+        try
+          <$> [ parsePrimaryKeyForCol
+              , parseNotNullForCol
+              , parseUniqueForCol
+              , parseDefaultVForCol
+              , parseReferenceForCol
+              , parseNullForCol
+              , parseCheckForCol
+              ]
+  t <-
+    many
+      ( lexeme (string "constraint")
+          *> parseWordAndComma
+          *> choice
+            ( try
+                <$> [ parsePrimaryKeyForCol
                     , parseNotNullForCol
                     , parseUniqueForCol
                     , parseDefaultVForCol
                     , parseReferenceForCol
-                    , parseNullForCol 
+                    , parseNullForCol
                     , parseCheckForCol
                     ]
-  t <- many (lexeme (string "constraint") *> parseWordAndComma *> choice (try <$> [
-                      parsePrimaryKeyForCol
-                    , parseNotNullForCol
-                    , parseUniqueForCol
-                    , parseDefaultVForCol
-                    , parseReferenceForCol
-                    , parseNullForCol 
-                    , parseCheckForCol
-                    ]))
+            )
+      )
   void $ optional ignoreConstraints
   return
     Column
@@ -57,27 +67,26 @@ skipOptionalParts =
 
 skipLikeClause :: Parser ()
 skipLikeClause = do
-  _ <- string "like"
-  _ <- parseWord
-  _ <- optional (between (char '(') (char ')') (skipManyTill anySingle (lookAhead (char ')'))))
+  _ <- lexeme $ string "like"
+  _ <- takeWhile1P Nothing (/= ';')
   return ()
 
 skipPartitioning :: Parser ()
 skipPartitioning = do
   _ <- lexeme (string "partition") *> lexeme (string "by")
-  _ <- takeWhileP Nothing (/= ')')
+  _ <- takeWhile1P Nothing (/= ';')
   return ()
 
 skipInheritsClause :: Parser ()
 skipInheritsClause = do
-  _ <- string "inherits"
-  _ <- between (char '(') (char ')') (parseWord `sepBy1` lexeme (char ','))
+  _ <- lexeme $ string "inherits"
+  _ <- takeWhile1P Nothing (/= ';')
   return ()
 
 skipUsingMethod :: Parser ()
 skipUsingMethod = do
-  _ <- string "using"
-  _ <- parseWord
+  _ <- lexeme $ string "using"
+  _ <- takeWhile1P Nothing (/= ';')
   return ()
 
 skipWithOrWithoutOids :: Parser ()
@@ -96,12 +105,14 @@ skipOnCommit = do
 
 skipTablespace :: Parser ()
 skipTablespace = do
-  _ <- string "tablespace"
-  _ <- parseWord
+  _ <- lexeme $ string "tablespace"
+  _ <- takeWhile1P Nothing (/= ';')
   return ()
 
 parseColumnOrConstraint :: Parser (Either Column TableConstraint)
-parseColumnOrConstraint = (Right <$> lexeme parseTableConstraint) <|> (Left <$> lexeme parseColumn) 
+parseColumnOrConstraint =
+  (Right <$> lexeme parseTableConstraint)
+    <|> (Left <$> lexeme parseColumn)
 
 parseCreateTable :: Parser Table
 parseCreateTable = do
@@ -113,8 +124,11 @@ parseCreateTable = do
   _ <- optional $ lexeme (string "if") *> lexeme (string "not") *> lexeme (string "exists")
   tName <- lexeme (takeWhile1P Nothing (`notElem` (" \t\n)(" :: String)))
   items <-
-    between (lexeme (char '(')) (lexeme (char ')')) (parseColumnOrConstraint `sepBy` lexeme (char ','))
-  _ <- optional skipOptionalParts
+    between
+      (lexeme (char '('))
+      (lexeme (char ')'))
+      (parseColumnOrConstraint `sepBy` lexeme (char ','))
+  _ <- optional $ lexeme skipOptionalParts
   let cols = [c | Left c <- items]
   let constraints = [con | Right con <- items]
   return Table {tableName = tName, columns = cols, tableConstraints = constraints}

src/Sql2er/Parser/CreateTable.hs

@@ -5,6 +5,22 @@ module ExamplesForTests where
 import Data.Text (Text)
 import Sql2er.Common.Types
 
+partitionConstraint :: Table
+partitionConstraint =
+  Table
+    { tableName = "cities"
+    , columns =
+        [ Column
+            { columnName = "city_id"
+            , columnType = PGinteger
+            , cConstraints = [NotNull]
+            }
+        , Column {columnName = "name", columnType = PGtext, cConstraints = [NotNull]}
+        , Column {columnName = "population", columnType = PGbigInt, cConstraints = []}
+        ]
+    , tableConstraints = []
+    }
+
 tableConstraint :: Table
 tableConstraint =
   Table
@@ -22,7 +38,7 @@ tableConstraint =
         , PrimaryKeyConstraint "y"
         , ForeignKeyConstraint "z" "sometable" (Just "z")
         , CheckConstraint "z > 23"
-        , UniqueConstraint ["y","z"]
+        , UniqueConstraint ["y", "z"]
         ]
     }
 

test/ExamplesForTests.hs

@@ -21,7 +21,6 @@ testParse inputText parsingFunc expectedOp failureMsg = do
           parsingFunc
           ""
           inputText
-  print eRes
   case eRes of
     Left _ -> assertFailure failureMsg
     Right r -> expectedOp @=? r
@@ -120,19 +119,38 @@ testTableConstraint =
           "Parsing failed for table constraints" 
     ]
 
+testPartitionConstraint :: TestTree
+testPartitionConstraint =
+    testGroup "partition constraint" [
+        testCase "paition with multiple parenthesis" $
+            testParse
+            (T.toLower
+                "CREATE TABLE cities (\
+    \city_id      int not null,\
+    \name         text not null,\
+    \population   bigint\
+    \) PARTITION BY LIST (left(lower(name), 1))"
+            )
+            parseCreateTable
+            Ex.partitionConstraint
+            "Parsing failed for table with partition"
+    ]
+
 createStatementTests :: TestTree
 createStatementTests =
   testGroup
     "Create statement tests"
     [ testCreateOrReplaceTable
     , testColumnConstraint
     , testTableConstraint
+    , testPartitionConstraint
     ]
 
 testSqlScripts :: Text -> TestTree
 testSqlScripts t = do
   let eRes = runParser parseSqlScript "" t
-  testCase "parsing script" (assertBool "" (isRight eRes))
+  testCase "parsing script" $ do 
+    assertBool "" (isRight eRes)
 
 main :: IO ()
 main = do