Migrate net sqlite to System.Data.SQLite

giis-uniovi · Jan 4, 2024 · 31ec646 · 31ec646
1 parent 90fa84b
commit 31ec646
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/net/TdRules/Java.Sql/SqliteConnectionFactory.N.cs b/net/TdRules/Java.Sql/SqliteConnectionFactory.N.cs
@@ -7,7 +7,11 @@ internal class SqliteConnectionFactory
     {
         public static DbConnection GetDbConnection(string url)
         {
-            return new Microsoft.Data.Sqlite.SqliteConnection(url);
+            // Microsoft.Data.SQLite solo es soportado hasta v2.0.1
+            // Versiones superiores causan errores que indican qel DataReader esta cerrado
+            // al manejar resultsets
+            // return new Microsoft.Data.Sqlite.SqliteConnection(url);
+            return new System.Data.SQLite.SQLiteConnection(url);
         }
     }
 }
diff --git a/net/TdRules/TdRules.csproj b/net/TdRules/TdRules.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -43,7 +43,7 @@
 
     <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
 
-    <PackageReference Include="Microsoft.Data.SQLite" Version="2.0.1" />
+    <PackageReference Include="System.Data.SQLite" Version="1.0.118" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/setup/database.properties b/setup/database.properties
@@ -55,4 +55,4 @@ tdrules.netcore.tdstorerdb2.sqlite.url=Data Source=../../../../tdrules.db;
 tdrules.netcore.tdstorerdb2.sqlite.user=
 
 tdrules.netcore.tdstorerdb2.sqlite.meta.dbms=Database: SQLite - Version: 3.
-tdrules.netcore.tdstorerdb2.sqlite.meta.driver=Driver: Microsoft.Data.Sqlite.SqliteConnection - Version: N/A
+tdrules.netcore.tdstorerdb2.sqlite.meta.driver=Driver: System.Data.SQLite.SQLiteConnection - Version: N/A
diff --git a/tdrules-store-rdb/src/test/resources/netcore.sqlite.metadata.types1.txt b/tdrules-store-rdb/src/test/resources/netcore.sqlite.metadata.types1.txt
@@ -1,14 +1,14 @@
 Metadata for Table: stypes1  Catalog:   Schema: 
 Column: pkauto
-  DataType: integer  DataSubType:   CompositeType: 
+  DataType: INTEGER  DataSubType:   CompositeType: 
   ColSize: 0  DecimalDigits: 0  CharacterLike: false  DateTimeLike: false
   NotNull: true  Key: true  Autoincrement: true  DefaultValue: 
 Column: tinteger
-  DataType: integer  DataSubType:   CompositeType: 
+  DataType: INTEGER  DataSubType:   CompositeType: 
   ColSize: 0  DecimalDigits: 0  CharacterLike: false  DateTimeLike: false
   NotNull: true  Key: false  Autoincrement: false  DefaultValue: 
 Column: tint4
-  DataType: int  DataSubType:   CompositeType: 
+  DataType: INT  DataSubType:   CompositeType: 
   ColSize: 0  DecimalDigits: 0  CharacterLike: false  DateTimeLike: false
   NotNull: false  Key: false  Autoincrement: false  DefaultValue: 
 Column: tint8
@@ -52,7 +52,7 @@ Column: tbit
   ColSize: 0  DecimalDigits: 0  CharacterLike: false  DateTimeLike: false
   NotNull: false  Key: false  Autoincrement: false  DefaultValue: 
 Column: treal
-  DataType: real  DataSubType:   CompositeType: 
+  DataType: REAL  DataSubType:   CompositeType: 
   ColSize: 0  DecimalDigits: 0  CharacterLike: false  DateTimeLike: false
   NotNull: false  Key: false  Autoincrement: false  DefaultValue: 
 Column: tfloat
@@ -80,7 +80,7 @@ Column: tvarchar
   ColSize: 16  DecimalDigits: 0  CharacterLike: true  DateTimeLike: false
   NotNull: false  Key: false  Autoincrement: false  DefaultValue: 
 Column: ttext
-  DataType: text  DataSubType:   CompositeType: 
+  DataType: TEXT  DataSubType:   CompositeType: 
   ColSize: 0  DecimalDigits: 0  CharacterLike: true  DateTimeLike: false
   NotNull: false  Key: false  Autoincrement: false  DefaultValue: 
 Column: tdate

diff --git a/tdrules-store-rdb/src/test/resources/netcore.sqlite.metadata.typesvp.txt b/tdrules-store-rdb/src/test/resources/netcore.sqlite.metadata.typesvp.txt
@@ -1,11 +1,11 @@
 Metadata for Table: stypesvp  Catalog:   Schema: 
 View SQL: CREATE VIEW stypesvp (p1,p2,p3) as select tinteger,tint4,tcharacter from stypes1
 Column: p1
-  DataType: integer  DataSubType:   CompositeType: 
+  DataType: INTEGER  DataSubType:   CompositeType: 
   ColSize: 0  DecimalDigits: 0  CharacterLike: false  DateTimeLike: false
   NotNull: false  Key: false  Autoincrement: false  DefaultValue: 
 Column: p2
-  DataType: int  DataSubType:   CompositeType: 
+  DataType: INT  DataSubType:   CompositeType: 
   ColSize: 0  DecimalDigits: 0  CharacterLike: false  DateTimeLike: false
   NotNull: false  Key: false  Autoincrement: false  DefaultValue: 
 Column: p3

diff --git a/tdrules-store-rdb/src/test/resources/netcore.sqlite.metadata.typesvxxl.txt b/tdrules-store-rdb/src/test/resources/netcore.sqlite.metadata.typesvxxl.txt
@@ -176,11 +176,11 @@ union all select tinteger,tint4,tcharacter from stypes1
 union all select tinteger,tint4,tcharacter from stypes1 
 union all select tinteger,tint4,tcharacter from stypes1
 Column: p1
-  DataType: integer  DataSubType:   CompositeType: 
+  DataType: INTEGER  DataSubType:   CompositeType: 
   ColSize: 0  DecimalDigits: 0  CharacterLike: false  DateTimeLike: false
   NotNull: false  Key: false  Autoincrement: false  DefaultValue: 
 Column: p2
-  DataType: int  DataSubType:   CompositeType: 
+  DataType: INT  DataSubType:   CompositeType: 
   ColSize: 0  DecimalDigits: 0  CharacterLike: false  DateTimeLike: false
   NotNull: false  Key: false  Autoincrement: false  DefaultValue: 
 Column: p3