Fixed scripting of TIME in Spreadsheet and SQL, and DATETIME2 in SQL

Author: nycdotnet

Code/TSqlFlex.Core.Tests/DataScriptingTests.cs

@@ -338,19 +338,10 @@ public void TIME_LowResolution_Data_ScriptsCorrectly()
         [Test()]
         public void TIME_HighResolution_Data_ScriptsCorrectly()
         {
-            DateTime baseData = new DateTime(1900,1,1,2,33,44);
+            TimeSpan baseData = new TimeSpan(TimeSpan.TicksPerHour * 2 + TimeSpan.TicksPerMinute * 33 + TimeSpan.TicksPerSecond * 44 + 1234567);
             object data = baseData;
             var fieldInfo = SchemaScriptingTests.FakeColumn("test", "test", 32, "time", false, 0, 0);
-            Assert.AreEqual("'02:33:44'", FieldScripting.valueAsTSQLLiteral(data, fieldInfo), "time no fractional seconds");
-            Assert.AreEqual("02:33:44", FieldScripting.formatTime(data, false), "time no fractional seconds");
-
-            baseData = new DateTime(1900, 1, 1, 2, 33, 44).AddMilliseconds(100);
-            data = baseData;
-            Assert.AreEqual("'02:33:44.1'", FieldScripting.valueAsTSQLLiteral(data, fieldInfo), "partial fractional seconds");
-            Assert.AreEqual("02:33:44.1", FieldScripting.formatTime(data, false), "partial fractional seconds");
-
-            baseData = new DateTime(1900, 1, 1, 2, 33, 44).AddTicks(1234567);
-            data = baseData;
+            
             Assert.AreEqual("'02:33:44.1234567'", FieldScripting.valueAsTSQLLiteral(data, fieldInfo), "time fractional seconds");
             Assert.AreEqual("02:33:44.1234567", FieldScripting.formatTime(data, false), "time fractional seconds");
         }
@@ -777,18 +768,15 @@ public void NULL_Data_ScriptsAsNull()
         [Test()]
         public void ReservedWord_IsScriptedWithBrackets()
         {
-
             string fieldName = "Drop";
             var fieldInfo = SchemaScriptingTests.FakeColumn(fieldName, "test", 32, "int", false, 0, 0);
 
             Assert.AreEqual("[Drop]", FieldScripting.FieldNameOrDefault(fieldInfo,0));
-
         }
 
         [Test()]
         public void FieldWithSpaces_IsScriptedWithBrackets()
         {
-
             string fieldName = "What We Should Be Sending";
             var fieldInfo = SchemaScriptingTests.FakeColumn(fieldName, "test", 32, "int", false, 0, 0);
 
@@ -798,7 +786,6 @@ public void FieldWithSpaces_IsScriptedWithBrackets()
         [Test()]
         public void FieldWithTab_IsScriptedWithBrackets()
         {
-
             string fieldName = "This\tThat";
             var fieldInfo = SchemaScriptingTests.FakeColumn(fieldName, "test", 32, "int", false, 0, 0);
 
@@ -808,7 +795,6 @@ public void FieldWithTab_IsScriptedWithBrackets()
         [Test()]
         public void FieldWithLineFeed_IsScriptedWithBrackets()
         {
-
             string fieldName = "This\nis";
             var fieldInfo = SchemaScriptingTests.FakeColumn(fieldName, "test", 32, "int", false, 0, 0);
 
@@ -818,7 +804,6 @@ public void FieldWithLineFeed_IsScriptedWithBrackets()
         [Test()]
         public void FieldWithOpenSquareBracket_IsScriptedWithBracketsButNotFurtherEscaped()
         {
-
             string fieldName = "test[ing";
             var fieldInfo = SchemaScriptingTests.FakeColumn(fieldName, "test", 32, "int", false, 0, 0);
 
@@ -828,7 +813,6 @@ public void FieldWithOpenSquareBracket_IsScriptedWithBracketsButNotFurtherEscape
         [Test()]
         public void FieldWithCloseSquareBracket_IsScriptedWithBracketsAndAlsoFurtherEscaped()
         {
-
             string fieldName = "test]ing";
             var fieldInfo = SchemaScriptingTests.FakeColumn(fieldName, "test", 32, "int", false, 0, 0);
 
@@ -838,7 +822,6 @@ public void FieldWithCloseSquareBracket_IsScriptedWithBracketsAndAlsoFurtherEsca
         [Test()]
         public void FieldWithCarriageReturn_IsScriptedWithBrackets()
         {
-
             string fieldName = "Crazy\rtown";
             var fieldInfo = SchemaScriptingTests.FakeColumn(fieldName, "test", 32, "int", false, 0, 0);
 
@@ -848,25 +831,21 @@ public void FieldWithCarriageReturn_IsScriptedWithBrackets()
         [Test()]
         public void NonReservedWord_IsScriptedWithoutBrackets()
         {
-
             string fieldName = "TestColumnName";
             var fieldInfo = SchemaScriptingTests.FakeColumn(fieldName, "test", 32, "int", false, 0, 0);
 
             Assert.AreEqual(false, TSqlRules.IsReservedWord(fieldName));
             Assert.AreEqual("TestColumnName", FieldScripting.FieldNameOrDefault(fieldInfo, 0));
-
         }
 
         [Test()]
         public void EmptyColumnName_IsScriptedAnonymously()
         {
-
             string fieldName = "";
             var fieldInfo = SchemaScriptingTests.FakeColumn(fieldName, "test", 32, "int", false, 0, 0);
 
             Assert.AreEqual(false, TSqlRules.IsReservedWord(fieldName));
             Assert.AreEqual("anonymousColumn1", FieldScripting.FieldNameOrDefault(fieldInfo, 0));
-
         }
 
         [Test()]

Code/TSqlFlex.Core.Tests/SchemaScriptingTests.cs

@@ -318,16 +318,24 @@ public void DATETIME2_ScriptsCorrectly()
              FlexResultSet fsr = new FlexResultSet();
 
              var dt = new List<SQLColumn>() {
-                 FakeColumn("DateTime2NotNull", "MyStuff", 8, "datetime2", false, 0, 0),
-                 FakeColumn("DateTime2Null", "MyStuff", 8, "datetime2", true, 0, 0)
+                 FakeColumn("DateTime2_0_NotNull", "MyStuff", 8, "datetime2", false, 0, 0),
+                 FakeColumn("DateTime2_0_Null", "MyStuff", 8, "datetime2", true, 0, 0),
+                 FakeColumn("DateTime2_3_NotNull", "MyStuff", 8, "datetime2", false, 0, 3),
+                 FakeColumn("DateTime2_3_Null", "MyStuff", 8, "datetime2", true, 0, 3),
+                 FakeColumn("DateTime2_7_NotNull", "MyStuff", 8, "datetime2", false, 0, 7),
+                 FakeColumn("DateTime2_7_Null", "MyStuff", 8, "datetime2", true, 0, 7)
              };
 
              fsr.results.Add(new FlexResult());
              fsr.results[0].schema = dt;
 
              var expected = @"CREATE TABLE MyTable(
-    DateTime2NotNull datetime2 NOT NULL,
-    DateTime2Null datetime2 NULL
+    DateTime2_0_NotNull datetime2(0) NOT NULL,
+    DateTime2_0_Null datetime2(0) NULL,
+    DateTime2_3_NotNull datetime2(3) NOT NULL,
+    DateTime2_3_Null datetime2(3) NULL,
+    DateTime2_7_NotNull datetime2 NOT NULL,
+    DateTime2_7_Null datetime2 NULL
 );
 ";
              Assert.AreEqual(expected, fsr.ScriptResultAsCreateTable(0, "MyTable"));

Code/TSqlFlex.Core.Tests/TSqlFlex.Core.Tests.csproj

@@ -35,9 +35,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Microsoft SQL Server\110\SDK\Assemblies\Microsoft.SqlServer.Types.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.4.1\lib\net35\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="nunit.framework, Version=3.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.7.1\lib\net35\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -57,6 +56,7 @@
     <Compile Include="SchemaScriptingTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TSqlRulesTests.cs" />
+    <Compile Include="XmlSpreadsheetRenderTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\TSqlFlex.Core\TSqlFlex.Core.csproj">

Code/TSqlFlex.Core.Tests/XmlSpreadsheetRenderTests.cs

@@ -0,0 +1,61 @@
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Xml;
+
+namespace TSqlFlex.Core.Tests
+{
+    [TestFixture()]
+    public class XmlSpreadsheetRenderTests
+    {
+        [Test()]
+        public void RenderingTimeField_RendersCorrectly()
+        {
+            var frs = new FlexResultSet();
+
+            var dt = new List<SQLColumn>() {
+                SchemaScriptingTests.FakeColumn("ColIntNotNull", "MyStuff", 32, "int", false, 255, 255),
+                SchemaScriptingTests.FakeColumn("ColIntNull", "MyStuff", 32, "int", true, 255, 255),
+                SchemaScriptingTests.FakeColumn("ColTimeOfDay", "MyStuff", 32, "time", true, 255, 255)
+            };
+
+            var result = new FlexResult() {
+                schema = dt,
+                data = new List<object[]>() {
+                    new object[] {99, 111, new TimeSpan(0, 00, 00, 00, 001)},
+                    new object[] {42, null, new TimeSpan(23,59,30)},
+                }
+            };
+
+            frs.results.Add(result);
+
+            var tempFileName = Guid.NewGuid().ToString() + ".txt";
+
+            var srp = new SqlRunParameters(new SqlConnectionStringBuilder(), "", SqlRunParameters.TO_XML_SPREADSHEET, tempFileName);
+            
+            XmlSpreadsheetRenderer.renderAsXMLSpreadsheet(frs, srp);
+
+            var xmlSpreadsheetContent = srp.getOutputStreamAsString(tempFileName);
+
+            Assert.IsTrue(xmlSpreadsheetContent.Length > 1000, "expected more than 1000 characters of output");
+
+            Assert.IsTrue(xmlSpreadsheetContent.Contains(">99<"));
+            Assert.IsTrue(xmlSpreadsheetContent.Contains(">111<"));
+            Assert.IsTrue(xmlSpreadsheetContent.Contains(">1899-12-31T00:00:00.001<"));
+            Assert.IsTrue(xmlSpreadsheetContent.Contains(">42<"));
+            Assert.IsTrue(xmlSpreadsheetContent.Contains(">1899-12-31T23:59:30.000<"));
+
+            XmlDocument doc = null;
+
+            Assert.DoesNotThrow(() => {
+                doc = new XmlDocument();
+                doc.LoadXml(xmlSpreadsheetContent);
+            }, "expected no exception");
+
+            Assert.IsNotNull(doc, "expected valid XML");
+        }
+    }
+}

Code/TSqlFlex.Core.Tests/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.4.1" targetFramework="net35" />
+  <package id="NUnit" version="3.7.1" targetFramework="net35" />
+  <package id="NUnit3TestAdapter" version="3.7.0" targetFramework="net35" />
 </packages>

Code/TSqlFlex.Core/FieldScripting.cs

@@ -83,6 +83,14 @@ public static string DataTypeParameterIfAny(SQLColumn fieldInfo)
                 }
                 return "";
             }
+            else if (fieldInfo.DataType == "datetime2")
+            {
+                if (fieldInfo.NumericScale < 7)
+                {
+                    return $"({fieldInfo.NumericScale.ToString()})";
+                }
+                return "";
+            }
             return "";
         }
 
@@ -571,7 +579,8 @@ public static string formatTime(object data, bool forTSQLScript = true)
             if (data is TimeSpan)
             {
                 TimeSpan t = (TimeSpan)data;
-                if (t.Milliseconds == 0)
+                long ticksAfterWholeSecond = t.Ticks - ((long)Math.Floor(t.TotalSeconds) * TimeSpan.TicksPerSecond);
+                if (ticksAfterWholeSecond == 0)
                 {
                     return String.Format("{3}{0}:{1}:{2}{3}",
                         t.Hours.ToString().PadLeft(2, '0'),
@@ -583,7 +592,7 @@ public static string formatTime(object data, bool forTSQLScript = true)
                         t.Hours.ToString().PadLeft(2, '0'),
                         t.Minutes.ToString().PadLeft(2, '0'),
                         t.Seconds.ToString().PadLeft(2, '0'),
-                        t.Milliseconds.ToString().PadLeft(3, '0').TrimEnd('0'),
+                        ticksAfterWholeSecond.ToString().PadLeft(7,'0').TrimEnd('0'),
                         quoting);
             }
             else if (data is DateTime)

Code/TSqlFlex.Core/Resources/XMLSpreadsheetTemplateHeader.txt

@@ -24,4 +24,7 @@
   <Style ss:ID="s64">
    <NumberFormat ss:Format="@"/>
   </Style>
+  <Style ss:ID="s65">
+   <NumberFormat ss:Format="Long Time"/>
+  </Style>
  </Styles>

Code/TSqlFlex.Core/SqlRunParameters.cs

@@ -44,18 +44,18 @@ public SqlRunParameters(SqlConnectionStringBuilder csb, string sqlToRun, string
 
             isolatedStore = Utils.getIsolatedStorageFile();
 
-            openNewOutputStream();
+            openNewOutputStream(outputFileName);
         }
 
         private string getNextFileName()
         {
             return "TSQLFlex_" + DateTime.UtcNow.ToString("yyyyMMddhhmmss.fffffff") + "_temp_" + outputFiles.Count + ".txt";
         }
 
-        public void openNewOutputStream()
+        public void openNewOutputStream(string outputFileName = "")
         {
             flushAndCloseOutputStreamIfNeeded();
-            this.currentFileName = getNextFileName();
+            this.currentFileName = String.IsNullOrEmpty(outputFileName) ? getNextFileName() : outputFileName;
             outputFiles.Add(this.currentFileName);
 
             Stream isoStream = new IsolatedStorageFileStream(this.currentFileName, FileMode.OpenOrCreate, FileAccess.Write, isolatedStore);
@@ -117,6 +117,15 @@ public void saveOutputStreamTo(string streamName, string saveAsFileName)
             isoStream.Close();
         }
 
+        public string getOutputStreamAsString(string streamName)
+        {
+            flushAndCloseOutputStreamIfNeeded();
+
+            var isoStream = new IsolatedStorageFileStream(streamName, FileMode.Open, FileAccess.Read, this.isolatedStore);
+            var reader = new StreamReader(isoStream);
+            return reader.ReadToEnd();
+        }
+
         //thanks! http://stackoverflow.com/questions/12970957/when-shall-i-do-a-explicity-flush-while-copying-streams-in-c
         public static void CopyStreamToEnd(Stream source, Stream destination)
         {

Code/TSqlFlex.Core/XmlSpreadsheetRenderer.cs

@@ -53,7 +53,7 @@ public static void renderAsXMLSpreadsheet(FlexResultSet resultSet, SqlRunParamet
                             {
                                 srp.WriteToStream(String.Format("<Cell><Data ss:Type=\"Number\">{0}</Data></Cell>\r\n", escapeForXML(FieldScripting.valueAsTSQLLiteral(fieldData, fieldInfo, false))));
                             }
-                            else if (fieldInfo.DataType == "date" || fieldInfo.DataType == "datetime2" || fieldInfo.DataType == "time" || fieldInfo.DataType == "datetime" ||
+                            else if (fieldInfo.DataType == "date" || fieldInfo.DataType == "datetime2" || fieldInfo.DataType == "datetime" ||
                                 fieldInfo.DataType == "smalldatetime")
                             {
                                 srp.WriteToStream(String.Format("<Cell ss:StyleID=\"s63\"><Data ss:Type=\"DateTime\">{0}.{1}</Data></Cell>\r\n",
@@ -70,6 +70,15 @@ public static void renderAsXMLSpreadsheet(FlexResultSet resultSet, SqlRunParamet
                             {
                                 srp.WriteToStream(String.Format("<Cell ss:StyleID=\"s64\"><Data ss:Type=\"String\">{0}</Data></Cell>\r\n", escapeForXML(FieldScripting.formatVarbinary(fieldData))));
                             }
+                            else if (fieldInfo.DataType == "time")
+                            {
+                                srp.WriteToStream(String.Format("<Cell ss:StyleID=\"s65\"><Data ss:Type=\"DateTime\">1899-12-31T{0}:{1}:{2}.{3}</Data></Cell>\r\n",
+                                    ((TimeSpan)fieldData).Hours.ToString("00"),
+                                    ((TimeSpan)fieldData).Minutes.ToString("00"),
+                                    ((TimeSpan)fieldData).Seconds.ToString("00"),
+                                    ((TimeSpan)fieldData).Milliseconds.ToString("000")
+                                    ));
+                            }
                             else
                             {
                                 srp.WriteToStream(String.Format("<Cell ss:StyleID=\"s64\"><Data ss:Type=\"String\">{0}</Data></Cell>\r\n", escapeForXML(FieldScripting.valueAsTSQLLiteral(fieldData, fieldInfo, false))));

README.md

@@ -18,6 +18,10 @@ Follow the instructions [here](https://github.com/nycdotnet/TSqlFlex/blob/master
 Please either create issues on GitHub, or reach out to Steve on Twitter at [@nycdotnet](https://twitter.com/nycdotnet).
 
 **Patch notes:**
+  * v0.2.1-beta (2016-07-13):
+      * Fixed scripting of TIME to XML Spreadsheet (no longer crashes)
+      * Improved scripting of TIME to SQL scripts - can include up to 7 digits of scale.
+      * Improved scripting of DATETIME2 to SQL scripts - now includes scale number if relevant.
   * v0.2.0-beta (2016-09-23):
       * Implemented new script as C# feature.
 	  * Many behind-the-scenes code improvements.