Query for JSON conversion is fixed

app/Main.hs

@@ -48,11 +48,6 @@ main = do
       let converRes = sqlRowToString res
       mapM_ putStrLn converRes
       putStrLn "\n****************"
-      -- TODO - JSON Conversion code is below
-      -- sqlValue <- getUnprocessedSQLHolidays conn
-      -- print $ show sqlValue
-      -- print "Done!"
-      -- putStrLn "\n****************"
       putStrLn "\nSee the holidays between specific dates... "
       putStrLn "\nInput the start date [DD-MMM-YY] "
       startDate <- getLine
@@ -82,6 +77,12 @@ main = do
         _ -> syntaxErrorGlobal
       putStrLn "\n****************"
       putStrLn $ "Number of rows in Table is " ++ show (length res)
+      putStrLn "\n****************"
+      -- TODO - JSON Conversion code is below
+      sqlValue <- getUnprocessedSQLHolidays conn
+      print $ show sqlValue
+      print "Done!"
+      putStrLn "\n****************"
 
 
 syntaxErrorGlobal :: IO ()

src/Database.hs

@@ -144,10 +144,17 @@ sqlRowToString :: [[SqlValue]] -> [String]
 sqlRowToString xs = map (fromSql :: SqlValue -> String) (concat xs)
 
 -- | Method to retrieve all the SQLs on the database.
-getUnprocessedSQLHolidays :: Connection -> IO [(String, String, String)]
+getUnprocessedSQLHolidays :: Connection -> IO [(String, String, String, String, Bool, Bool)]
 getUnprocessedSQLHolidays conn = do
-  res <- quickQuery' conn "SELECT date, localName, name FROM holidays" []
-  return $ map (\xs -> (fromSql (xs !! 0), fromSql (xs !! 1), fromSql (xs !! 2))) res
+  res <-
+    quickQuery'
+      conn
+      "SELECT holidays.date, holidays.localName, holidays.name, countries.countryCode, countries.global, countries.fixed FROM holidays \
+      \INNER JOIN countries \
+      \WHERE countries.id=holidays.id \
+      \ORDER BY countries.id ASC"
+      []
+  return $ map (\xs -> (fromSql (xs !! 0), fromSql (xs !! 1), fromSql (xs !! 2), fromSql (xs !! 3), fromSql (xs !! 4), fromSql (xs !! 5))) res
 
 getUnprocessedSQLCountries :: Connection -> IO [(String, Bool)]
 getUnprocessedSQLCountries conn = do