excluding with statements from dependencies

Author: lamg

src/MigLib/DeclarativeMigrations/SqlParser.fs

@@ -19,19 +19,13 @@ type SqlVisitor() =
   let rec childrenToText (x: Tree.IParseTree) =
     seq {
       if x.ChildCount = 0 then
+
         yield x.GetText()
       else
         for n in { 0 .. x.ChildCount - 1 } do
-          yield! childrenToText (x.GetChild(n))
+          yield! n |> x.GetChild |> childrenToText
     }
 
-  let selectDependencies (context: SQLiteParser.Select_stmtContext) =
-    context.select_core ()
-    |> Seq.head
-    |> _.table_or_subquery()
-    |> Seq.map (fun t -> t.table_name().GetText())
-    |> Seq.toList
-
   override this.VisitSql_stmt_list(context: SQLiteParser.Sql_stmt_listContext) =
     context.sql_stmt ()
     |> Array.choose (this.Visit >> Option.ofObj)
@@ -131,18 +125,38 @@ type SqlVisitor() =
         constraints = constraints } //TODO parse table constraints
 
 
-  override this.VisitCreate_view_stmt(context: SQLiteParser.Create_view_stmtContext) =
+  override _.VisitCreate_view_stmt(context: SQLiteParser.Create_view_stmtContext) =
+    let selectDependencies (context: SQLiteParser.Select_stmtContext) =
+      context.select_core ()
+      |> Seq.head
+      |> _.table_or_subquery()
+      |> Seq.map (fun t -> t.table_name().GetText())
+      |> Seq.toList
+
+    // FIXME it's possible the remaining UNION  clauses are ignored because of a bug in the grammar
     let sql = context.children |> Seq.map childrenToText |> Seq.concat
 
     let name = context.view_name().GetText().Trim '"'
 
     // FIXME assumes a query in the form `FROM table0, table1, …`
     let tables = context.select_stmt () |> selectDependencies
 
+    let withTables, withDeps =
+      match context.select_stmt().common_table_stmt () with
+      | null -> [], []
+      | ct ->
+        ct.common_table_expression ()
+        |> Array.map (fun x -> x.table_name().GetText(), selectDependencies (x.select_stmt ()))
+        |> Array.unzip
+        |> fun (xs, yss) -> Array.toList xs, yss |> Array.toList |> List.concat
+
+    // FIXME for WITH statements inside WITH statements this trick might not work
+    let topLevelTables = set tables + set withDeps - set withTables |> Set.toList
+
     View
       { name = name
         sqlTokens = sql
-        dependencies = tables }
+        dependencies = topLevelTables }
 
   override this.VisitCreate_index_stmt(context: SQLiteParser.Create_index_stmtContext) =
     let name = context.index_name().GetText().Trim '"'
@@ -197,6 +211,6 @@ let parse (_file: string, sql: string) =
                 triggers = t :: acc.triggers }
           | StatList ys -> failwith $"unexpected statement list {ys}")
         emptyFile
-      |> Ok
-    | Some expr -> Error $"expecting statement list, got {expr}"
-    | None -> Ok emptyFile
+      |> Result.Ok
+    | Some expr -> Result.Error $"expecting statement list, got {expr}"
+    | None -> Result.Ok emptyFile

src/MigLib/MigLib.fsproj

@@ -6,7 +6,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
 
     <PackageId>MigLib</PackageId>
-    <Version>1.0.4</Version>
+    <Version>1.0.5</Version>
     <PackageOutputPath>./nupkg</PackageOutputPath>
     <InvariantGlobalization>true</InvariantGlobalization>
     <RootNamespace>migrate</RootNamespace>

src/Test/ViewMigration.fs

@@ -20,13 +20,35 @@ let view0 =
 
 let schema0 = student
 
-let schema1 =
+let schema0' =
   $"
   {student};
   {view0}
 "
 
-let cases = [ schema0, schema1, Ok [ view0 ] ]
+let view1 =
+  "CREATE VIEW view0 AS WITH bla AS( SELECT * FROM coco) SELECT * FROM bla b, student s"
+
+let schema1 =
+  $"
+  {student};
+  {view1}
+"
+
+// let view2 = "CREATE VIEW view0 AS SELECT * FROM coco UNION SELECT * FROM pepe"
+
+// let schema2 =
+//   $"
+//   {student};
+//   {view2}
+// "
+
+let cases =
+  [ schema0, schema0', Ok [ view0 ]
+    schema0, schema1, Ok [ view1 ]
+    // schema0, schema2, Ok [ view2 ] ]
+    ]
+
 
 let testViewMigration (case: int) (left: string, right: string, r: Result<string list, string>) =
   result {

src/mig/mig.fsproj

@@ -10,7 +10,7 @@
     <PackageId>migtool</PackageId>
     <RootNamespace>migrate</RootNamespace>
     <AssemblyName>migrate</AssemblyName>
-    <Version>1.0.4</Version>
+    <Version>1.0.5</Version>
     <PackageOutputPath>./nupkg</PackageOutputPath>
     <InvariantGlobalization>true</InvariantGlobalization>