TextScript.GetDependencies check only first batch

max-ieremenko · May 27, 2021 · 6233a1e · 6233a1e
1 parent e569a45
commit 6233a1e
Show file tree

Hide file tree

Showing 6 changed files with 95 additions and 11 deletions.
diff --git a/Sources/SqlDatabase.Test/Scripts/MsSql/MsSqlTextReaderTest.cs b/Sources/SqlDatabase.Test/Scripts/MsSql/MsSqlTextReaderTest.cs
@@ -36,8 +36,13 @@ public void IsGo(string line, bool expected)
         [TestCaseSource(nameof(GetSplitByGoTestCases))]
         public void SplitByGo(Stream input, string[] expected)
         {
-            var actual = _sut.Read(input);
-            actual.ShouldBe(expected);
+            var batches = _sut.ReadBatches(input);
+            batches.ShouldBe(expected);
+
+            input.Position = 0;
+
+            var first = _sut.ReadFirstBatch(input);
+            first.ShouldBe(expected[0]);
         }
 
         private static IEnumerable<TestCaseData> GetSplitByGoTestCases()

diff --git a/Sources/SqlDatabase.Test/Scripts/PgSql/PgSqlTextReaderTest.cs b/Sources/SqlDatabase.Test/Scripts/PgSql/PgSqlTextReaderTest.cs
@@ -7,12 +7,44 @@ namespace SqlDatabase.Scripts.PgSql
     [TestFixture]
     public class PgSqlTextReaderTest
     {
+        private PgSqlTextReader _sut;
+
+        [SetUp]
+        public void BeforeEachTest()
+        {
+            _sut = new PgSqlTextReader();
+        }
+
+        [Test]
+        public void ReadFirstBatch()
+        {
+            const string Expected = @"
+
+/*
+* module dependency: a 2.0
+* module dependency: b 1.0
+*/
+;
+line 2;";
+
+            var actual = _sut.ReadFirstBatch(Expected.AsFuncStream()());
+
+            actual.ShouldBe(@"/*
+* module dependency: a 2.0
+* module dependency: b 1.0
+*/");
+        }
+
         [Test]
-        public void Read()
+        public void ReadBatches()
         {
-            const string Expected = "abc";
+            const string Expected = @"
+
+line 1;
+;
+line 2;";
 
-            var actual = new PgSqlTextReader().Read(Expected.AsFuncStream()());
+            var actual = _sut.ReadBatches(Expected.AsFuncStream()());
 
             actual.ShouldBe(new[] { Expected });
         }

diff --git a/Sources/SqlDatabase/Scripts/ISqlTextReader.cs b/Sources/SqlDatabase/Scripts/ISqlTextReader.cs
@@ -5,6 +5,8 @@ namespace SqlDatabase.Scripts
 {
     internal interface ISqlTextReader
     {
-        IEnumerable<string> Read(Stream sql);
+        string ReadFirstBatch(Stream sql);
+
+        IEnumerable<string> ReadBatches(Stream sql);
     }
 }
diff --git a/Sources/SqlDatabase/Scripts/MsSql/MsSqlTextReader.cs b/Sources/SqlDatabase/Scripts/MsSql/MsSqlTextReader.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 
@@ -9,7 +10,12 @@ internal sealed class MsSqlTextReader : ISqlTextReader
     {
         private readonly Regex _goRegex = new Regex("^(\\s*(go)+\\s*)+$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
-        public IEnumerable<string> Read(Stream sql)
+        public string ReadFirstBatch(Stream sql)
+        {
+            return ReadBatches(sql).FirstOrDefault();
+        }
+
+        public IEnumerable<string> ReadBatches(Stream sql)
         {
             var batch = new StringBuilder();
 

diff --git a/Sources/SqlDatabase/Scripts/PgSql/PgSqlTextReader.cs b/Sources/SqlDatabase/Scripts/PgSql/PgSqlTextReader.cs
@@ -1,11 +1,50 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
 
 namespace SqlDatabase.Scripts.PgSql
 {
     internal sealed class PgSqlTextReader : ISqlTextReader
     {
-        public IEnumerable<string> Read(Stream sql)
+        private const int MaxFirstBatchSize = 20;
+        private readonly Regex _semicolonRegex = new Regex("^(\\s*;+\\s*)+$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
+        public string ReadFirstBatch(Stream sql)
+        {
+            var script = new StringBuilder();
+
+            using (var reader = new StreamReader(sql))
+            {
+                string line;
+                var lineNumber = 0;
+                while ((line = reader.ReadLine()) != null)
+                {
+                    if (script.Length == 0 && string.IsNullOrWhiteSpace(line))
+                    {
+                        continue;
+                    }
+
+                    lineNumber++;
+                    if (_semicolonRegex.IsMatch(line) || lineNumber > MaxFirstBatchSize)
+                    {
+                        break;
+                    }
+
+                    if (script.Length > 0)
+                    {
+                        script.AppendLine();
+                    }
+
+                    script.Append(line);
+                }
+            }
+
+            return script.ToString();
+        }
+
+        public IEnumerable<string> ReadBatches(Stream sql)
         {
             string script;
             using (var reader = new StreamReader(sql))

diff --git a/Sources/SqlDatabase/Scripts/TextScript.cs b/Sources/SqlDatabase/Scripts/TextScript.cs
@@ -72,7 +72,7 @@ public IList<ScriptDependency> GetDependencies()
             string batch;
             using (var sql = ReadSqlContent())
             {
-                batch = TextReader.Read(sql).FirstOrDefault();
+                batch = TextReader.ReadFirstBatch(sql);
             }
 
             if (string.IsNullOrWhiteSpace(batch))
@@ -162,7 +162,7 @@ private IEnumerable<string> ResolveBatches(IVariables variables, ILogger logger)
             var batches = new List<string>();
             using (var sql = ReadSqlContent())
             {
-                foreach (var batch in TextReader.Read(sql))
+                foreach (var batch in TextReader.ReadBatches(sql))
                 {
                     var script = scriptParser.ApplyVariables(batch);
                     if (!string.IsNullOrWhiteSpace(script))