Accept any path for table relations

Author: garyb

src/SqlSquared/Parser.purs

@@ -570,7 +570,7 @@ parenRelation = do
 tableRelation ∷ ∀ m t. SqlParser m t (Sig.Relation t)
 tableRelation = do
   i ← ident
-  path ← Pt.parseAnyFilePath P.fail i
+  path ← Pt.parseAnyPath P.fail i
   a ← PC.optionMaybe do
     _ ← keyword "as"
     ident

src/SqlSquared/Path.purs

@@ -3,6 +3,8 @@ module SqlSquared.Path
   , printAnyFilePath
   , parseAnyDirPath
   , printAnyDirPath
+  , parseAnyPath
+  , printAnyPath
   , genAnyFilePath
   , genAnyDirPath
   , module PathyTypeReexprts
@@ -20,7 +22,6 @@ import Pathy (AnyDir, AnyFile)
 import Pathy.Gen as PtGen
 import SqlSquared.Utils ((∘))
 
-
 printAnyDirPath :: AnyDir -> String
 printAnyDirPath = E.either
   (Pt.sandboxAny >>> Pt.unsafePrintPath Pt.posixPrinter)
@@ -47,6 +48,17 @@ parseAnyFilePath fail = Pt.parsePath Pt.posixParser
   (pure ∘ E.Left)
   (fail "Expected valid path")
 
+printAnyPath :: E.Either AnyDir AnyFile -> String
+printAnyPath = E.either printAnyDirPath printAnyFilePath
+
+parseAnyPath :: forall m. Applicative m => (forall a. String -> m a) -> String -> m (E.Either AnyDir AnyFile)
+parseAnyPath fail = Pt.parsePath Pt.posixParser
+  (pure ∘ E.Left ∘ E.Right)
+  (pure ∘ E.Left ∘ E.Left)
+  (pure ∘ E.Right ∘ E.Right)
+  (pure ∘ E.Right ∘ E.Left)
+  (fail "Expected valid path")
+
 genAnyFilePath :: forall m. Gen.MonadGen m => MonadRec m => m AnyFile
 genAnyFilePath = Gen.oneOf
   $ (E.Left <$> PtGen.genAbsFilePath)

src/SqlSquared/Signature/Relation.purs

@@ -5,6 +5,7 @@ import Prelude
 import Control.Monad.Gen as Gen
 import Control.Monad.Gen.Common as GenC
 import Control.Monad.Rec.Class (class MonadRec)
+import Data.Either (Either(..), either)
 import Data.Foldable as F
 import Data.Maybe (Maybe)
 import Data.NonEmpty ((:|))
@@ -15,6 +16,7 @@ import SqlSquared.Path as Pt
 import SqlSquared.Signature.Ident as ID
 import SqlSquared.Signature.JoinType as JT
 import SqlSquared.Utils ((∘))
+
 type JoinRelR a =
   { left ∷ Relation a
   , right ∷ Relation a
@@ -33,7 +35,7 @@ type VariRelR =
   }
 
 type TableRelR =
-  { path ∷ Pt.AnyFile
+  { path ∷ Either Pt.AnyDir Pt.AnyFile
   , alias ∷ Maybe String
   }
 
@@ -86,7 +88,7 @@ printRelation = case _ of
     ":" <> ID.printIdent vari <> F.foldMap (\a → " AS " <> ID.printIdent a) alias
   TableRelation { path, alias } →
     "`"
-    <> Pt.printAnyFilePath path
+    <> either Pt.printAnyDirPath Pt.printAnyFilePath path
     <> "`"
     <> F.foldMap (\x → " AS " <> ID.printIdent x) alias
   JoinRelation { left, right, joinType, clause } →
@@ -117,7 +119,7 @@ genRelation n =
     alias ← GenC.genMaybe GenS.genUnicodeString
     pure $ VariRelation { vari, alias }
   genTable = do
-    path ← Pt.genAnyFilePath
+    path ← Right <$> Pt.genAnyFilePath
     alias ← GenC.genMaybe GenS.genUnicodeString
     pure $ TableRelation { path, alias }
   genExpr = do

test/src/Constructors.purs

@@ -23,7 +23,7 @@ selectQuery =
     ]
     ( Just $ S.TableRelation
         { alias: Nothing
-        , path: E.Left
+        , path: E.Right $ E.Left
           $ Pt.rootDir
           Pt.</> Pt.dir (SProxy :: SProxy "mongo")
           Pt.</> Pt.dir (SProxy :: SProxy "testDb")
@@ -50,7 +50,7 @@ buildSelectQuery =
     ∘ (S._relations ?~
          (S.TableRelation
            { alias: Nothing
-           , path: E.Left
+           , path: E.Right $ E.Left
              $ Pt.rootDir
              Pt.</> Pt.dir (SProxy :: SProxy "mongo")
              Pt.</> Pt.dir (SProxy :: SProxy "testDb")