Merge pull request #17 from ret-Phoenix/release_15

Косметический фикс + проверка тестов на совместимость с OneScript.1.0.15

Author: ret-Phoenix

fixtures/ms-sql-server-con-str.txt

@@ -1 +1 @@
-Integrated Security=SSPI;Persist Security Info=False;User ID="";Initial Catalog="test";Data Source=FIN91\SQLEXPRESS
+Integrated Security=SSPI;Persist Security Info=False;User ID="";Initial Catalog="test";Data Source=VAIO\SQLEXPRESS

fixtures/pgsql-con-str.txt

@@ -1 +1 @@
-Host=localhost;Username=testuser;Password=123;Database=test;Port=5432
+Host=localhost;Username=testuser;Password=testuser;Database=test;Port=5432

oscript-sql/QueryResult.cs

@@ -11,6 +11,7 @@
 using System.Threading.Tasks;
 using System.Data.SQLite;
 using System.Data.Common;
+using ScriptEngine.HostedScript.Library.Binary;
 
 namespace OScriptSql
 {

oscript-sql/SQLQuery.cs

@@ -136,10 +136,10 @@ public int ExecuteCommand()
 
             string[] verInfo = versionOnescript.Split('.');
 
-            if (Convert.ToInt64(verInfo[2]) >= 15)
-            {
-                Console.WriteLine("> 15");
-            }
+            //if (Convert.ToInt64(verInfo[2]) >= 15)
+            //{
+            //    Console.WriteLine("> 15");
+            //}
 
             var result = new QueryResult();
 

oscript-sql/oscript-sql.csproj

@@ -58,16 +58,20 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\portable\OneScript\bin\ext\sql\MySql.Data.dll</HintPath>
     </Reference>
-    <Reference Include="Npgsql, Version=3.1.7.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
-      <HintPath>..\packages\Npgsql.3.1.7\lib\net45\Npgsql.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ScriptEngine, Version=1.0.14.195, Culture=neutral, processorArchitecture=x86">
-      <HintPath>..\packages\OneScript.1.0.14\lib\net40\ScriptEngine.dll</HintPath>
+    <Reference Include="Npgsql, Version=3.1.9.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Npgsql.3.1.9\lib\net45\Npgsql.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ScriptEngine.HostedScript, Version=1.0.14.195, Culture=neutral, processorArchitecture=x86">
-      <HintPath>..\packages\OneScript.StandardLibrary.1.0.14\lib\net40\ScriptEngine.HostedScript.dll</HintPath>
+    <Reference Include="ScriptEngine, Version=1.0.15.260, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\OneScript.1.0.15\lib\net40\ScriptEngine.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="ScriptEngine.HostedScript, Version=1.0.15.260, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\OneScript.StandardLibrary.1.0.15\lib\net40\ScriptEngine.HostedScript.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

oscript-sql/packages.config

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="DotNetZip" version="1.10.1" targetFramework="net45" />
-  <package id="Npgsql" version="3.1.7" targetFramework="net45" />
-  <package id="OneScript" version="1.0.14" targetFramework="net45" />
-  <package id="OneScript.StandardLibrary" version="1.0.14" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
+  <package id="Npgsql" version="3.1.9" targetFramework="net45" />
+  <package id="OneScript" version="1.0.15" targetFramework="net45" />
+  <package id="OneScript.StandardLibrary" version="1.0.15" targetFramework="net45" />
 </packages>

release/release-bin.zip

@@ -47,8 +47,8 @@
 	Соединение = Новый Соединение();
 	Соединение.ТипСУБД = Соединение.ТипыСУБД.MSSQLServer;
 	Соединение.СтрокаСоединения = СтрокаСоединения;
-	Соединение.Открыть();
 
+	Соединение.Открыть();
 	ЗапросВставка = Новый Запрос();
 	ЗапросВставка.УстановитьСоединение(Соединение);
 	ЗапросВставка.Текст = "Create table #users (id integer, name varchar(50))";