Review .net ResultSet wrapper

net/TdRules/Java.Sql/DriverManager.cs

@@ -1,5 +1,4 @@
 using System.Data.Common;
-using System.Data.SqlClient;
 
 namespace Java.Sql
 {
@@ -14,12 +13,12 @@ public static Connection GetConnection(string url, string user, string password)
         {
             DbConnection nativeConn;
             if (url.ToLower().StartsWith("server"))
-                nativeConn = new SqlConnection(url
+                nativeConn = new System.Data.SqlClient.SqlConnection(url
                     + (string.IsNullOrEmpty(user) ? "" : ";UID=" + user)
                     + (string.IsNullOrEmpty(password) ? "" : ";PWD=" + password)
                     + ";MultipleActiveResultSets=true");
             else if (url.ToLower().StartsWith("data source"))
-                nativeConn = new Microsoft.Data.Sqlite.SqliteConnection(url);
+                nativeConn = SqliteConnectionFactory.GetDbConnection(url);
             else
                 throw new SQLException("Unrecognized connection string, it should start with 'Server' (SqlServer) or 'Data Source' (Sqlite), but was " + url);
             nativeConn.Open();

net/TdRules/Java.Sql/ResultSet.N.cs

@@ -102,35 +102,28 @@ public int GetInt(string field)
             object Value=GetCellValue(field);
             if (this.LastFieldWasNull)
                 return 0;
-            return (int)Value;
+            return Convert.ToInt32(Value);
         }
         public int GetInt(int col)
         {
             object Value = GetCellValue(col);
             if (this.LastFieldWasNull)
                 return 0;
-            return (int)Value;
+            return Convert.ToInt32(Value);
         }
-        public long GetLong(int col)
-        {
-            object Value = GetCellValue(col);
-            if (this.LastFieldWasNull)
-                return 0;
-            return (long)Value;
-        }
-        public short GetShort(string field)
+        public long GetLong(string field)
         {
             object Value = GetCellValue(field);
             if (this.LastFieldWasNull)
                 return 0;
-            return short.Parse(Value.ToString()); //no permite cast short
+            return Convert.ToInt64(Value);
         }
-        public short GetShort(int col)
+        public long GetLong(int col)
         {
             object Value = GetCellValue(col);
             if (this.LastFieldWasNull)
                 return 0;
-            return short.Parse(Value.ToString());
+            return Convert.ToInt64(Value);
         }
         public bool GetBoolean(string field)
         {

net/TdRules/Java.Sql/SqliteConnectionFactory.N.cs

@@ -0,0 +1,13 @@
+//This is part of CORE.Net, don't edit outside this solution
+using System.Data.Common;
+
+namespace Java.Sql
+{
+    internal class SqliteConnectionFactory
+    {
+        public static DbConnection GetDbConnection(string url)
+        {
+            return new Microsoft.Data.Sqlite.SqliteConnection(url);
+        }
+    }
+}

tdrules-store-rdb/src/test/java/test4giis/tdrules/store/rdb/TestSqlserverResultSet.java

@@ -0,0 +1,113 @@
+package test4giis.tdrules.store.rdb;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Date;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import giis.portable.util.JavaCs;
+
+/**
+ * Reading basic data types from a ResultSet, check nullability and access by name or column number.
+ * Intended to test the .net ResultSet wrapper implementation
+ */
+public class TestSqlserverResultSet extends Base {
+	protected Connection dbt;
+	protected ResultSet rs;
+
+	protected String sCreate1 = "create table tabrs1 (pk integer primary key not null, "
+			+ "tint integer, tchar varchar(16), tdate date, tlong bigint)";
+	protected String sSelect1 = "select pk, tint, tchar, tdate, tlong from tabrs1";
+
+	@Before
+	public void setUp() throws SQLException {
+		super.setUp();
+		dbt = getConnection(TEST_DBNAME2);
+		executeNotThrow(dbt, "drop table tabrs1");
+		execute(dbt, sCreate1);
+	}
+
+	@After
+	public void tearDown() throws SQLException {
+		if (rs != null)
+			rs.close();
+		dbt.close();
+	}
+
+	@Test
+	public void testReadResultSet() throws SQLException {
+		execute(dbt, "insert into tabrs1 (pk,tint,tchar,tdate,tlong) values(1, 2, null, '2023-01-02', null)");
+		execute(dbt, "insert into tabrs1 (pk,tint,tchar,tdate,tlong) values(2, null, 'chrchr', null, 55)");
+
+		// 1st round: even columns are not null/odd columns are null (except pk), 
+		// read by column number
+		rs = query(dbt, sSelect1);
+		assertTrue(rs.next());
+		assertEquals(1, rs.getInt(1));
+
+		int tint = rs.getInt(2);
+		assertFalse(rs.wasNull());
+		assertEquals(2, tint);
+		assertEquals("2", rs.getString(2));
+
+		String tchar = rs.getString(3);
+		assertTrue(rs.wasNull());
+		assertEquals(null, tchar);
+
+		Date tdate;
+		if (!"sqlite".equals(dbmsname)) { // sqlite does not have native Date
+			tdate = rs.getDate(4);
+			assertFalse(rs.wasNull());
+			assertEquals("2023-01-02", dateString(tdate)); // normalize Date for .net compatibility
+			assertNotNull(rs.getString(4)); // do not check value because is system/locale dependent
+		}
+
+		long tlong = rs.getLong(5);
+		assertTrue(rs.wasNull());
+		assertEquals(0, tlong);
+
+		// 2nd round: alternate nullability, read by column name
+		assertTrue(rs.next());
+		assertEquals(2, rs.getInt("pk"));
+
+		tint = rs.getInt("tint");
+		assertTrue(rs.wasNull());
+		assertEquals(0, tint);
+		assertEquals(null, rs.getString("tint"));
+
+		tchar = rs.getString("tchar");
+		assertFalse(rs.wasNull());
+		assertEquals("chrchr", tchar);
+
+		if (!"sqlite".equals(dbmsname)) {
+			tdate = rs.getDate("tdate");
+			assertTrue(rs.wasNull());
+			if ("java".equals(PLATFORM))
+				assertEquals(null, tdate);
+			else // on .net, DateTime is no nullable, returns DateTime.MinValue
+				assertEquals("0001-01-01", dateString(tdate));
+			assertEquals(null, rs.getString("tdate"));
+		}
+
+		tlong = rs.getLong("tlong");
+		assertFalse(rs.wasNull());
+		assertEquals(55, tlong);
+		assertEquals("55", rs.getString("tlong"));
+
+		// resultset end
+		assertFalse(rs.next());
+	}
+
+	private String dateString(Date dt) {
+		return JavaCs.substring(JavaCs.getIsoDate(dt), 0, 10);
+	}
+}

tdrules-store-rdb/src/test/java/test4giis/tdrules/store/rdb/TestSqlserverSchemaMetadata.java

@@ -156,7 +156,7 @@ protected void assertMetadata(String metadata, String fileName) {
 		FileUtil.fileWrite(TEST_PATH_OUTPUT, fileName, metadata);
 		String expected = FileUtil.fileRead(TEST_PATH_BENCHMARK, fileName);
 		VisualAssert va = new VisualAssert().setFramework(Framework.JUNIT4);
-		va.assertEquals(expected, metadata);
+		va.assertEquals(expected.replace("\r", ""), metadata.replace("\r", ""));
 	}
 
 	/**

tdrules-store-rdb/src/test/java/test4giis/tdrules/store/rdb/sqlite/TestSqliteResultSet.java

@@ -0,0 +1,11 @@
+package test4giis.tdrules.store.rdb.sqlite;
+
+import test4giis.tdrules.store.rdb.TestSqlserverResultSet;
+
+public class TestSqliteResultSet extends TestSqlserverResultSet {
+
+	public TestSqliteResultSet() {
+		this.dbmsname = "sqlite";
+	}
+
+}