update sorma2

Author: zoff99

sorma2/README.md

@@ -1,11 +1,11 @@
-# Sorma<sup>2</sup> - Simple ORM(Android)<sup>2</sup>
+# Sorma<sup>2</sup> - Simple ORM(Android)<sup>2</sup> <sub>(also for Desktop)<sub>
 
 It is based on the wonderful https://github.com/maskarade/Android-Orma by [FUJI Goro](https://github.com/gfx)
 <br>
 <br>
 This is a rewrite in pure java, to generate most stuff you need and then add it to your project
 either as a ```.jar file``` or as ```java source```.<br>
-You still need to add ```sqlite-jdbc-3.51.0.0.jar``` to your project to use it.<br>
+You still need to add ```sqlite-jdbc-3.51.1.0.jar``` to your project to use it.<br>
 <br><br>
 ~~sadly [sqlite-jdbc](https://github.com/xerial/sqlite-jdbc) project decided that it needs ```slf4j-api jar``` (for no good reason).~~
 this was solved by: https://github.com/xerial/sqlite-jdbc/pull/1178
@@ -40,7 +40,7 @@ public class Person
 
 now create the Java sources with the Java SORMA2 Generator. <b>you need at least java 17</b>.<br>
 ```bash
-java -classpath ".:sqlite-jdbc-3.51.0.0.jar:sorma2.jar" \
+java -classpath ".:sqlite-jdbc-3.51.1.0.jar:sorma2.jar" \
   com/zoffcc/applications/sorm/Generator "gen"
 ```
 
@@ -85,10 +85,15 @@ see: https://github.com/zoff99/sorma2/tree/master/test
 
 <img src="https://github.com/zoff99/sorma2/releases/download/nightly/console_screen.png" width="70%">
 
-Use the `sorma_generated.jar` (that is generated in the `gen` directory) and `sqlite-jdbc-3.51.0.0.jar` for the Java project.<br>
+Use the `sorma_generated.jar` (that is generated in the `gen` directory) and `sqlite-jdbc-3.51.1.0.jar` for the Java project.<br>
 Check `TestSorma.java` for an Example usage.
 <br>
 
+Desktop (Linux / Windows / macOS) Gradle Example Project
+------------------------
+see: https://github.com/zoff99/sorma2/tree/master/example_gradle_linux
+<br>
+
 
 <br>
 Any use of this project's code by GitHub Copilot, past or present, is done

sorma2/do_compile.sh

@@ -1,7 +1,7 @@
 #! /bin/bash
 
 javac \
--cp "sqlite-jdbc-3.51.0.0.jar" \
+-cp "sqlite-jdbc-3.51.1.0.jar" \
 com/zoffcc/applications/sorm/Column.java \
 com/zoffcc/applications/sorm/Index.java \
 com/zoffcc/applications/sorm/Log.java \

sorma2/do_run.sh

@@ -1,12 +1,12 @@
 #! /bin/bash
 
 java \
--classpath ".:sqlite-jdbc-3.51.0.0.jar:sorma2.jar" \
+-classpath ".:sqlite-jdbc-3.51.1.0.jar:sorma2.jar" \
 com/zoffcc/applications/sorm/Generator "gen" || exit 1
 
 cd gen/
 javac \
--cp "sqlite-jdbc-3.51.0.0.jar" \
+-cp "sqlite-jdbc-3.51.1.0.jar" \
 com/zoffcc/applications/sorm/*.java && \
 jar cf sorma_generated.jar com/zoffcc/applications/sorm/*.class && \
 cp sorma_generated.jar ../test/ && \
@@ -15,12 +15,12 @@ cd ../ || exit 1
 # use generated custom jar
 cd test/
 javac \
--classpath ".:sqlite-jdbc-3.51.0.0.jar:sorma_generated.jar" \
+-classpath ".:sqlite-jdbc-3.51.1.0.jar:sorma_generated.jar" \
 org/example/TestSorma.java || exit 1
 
 rm -f main.db
 
 java \
--classpath ".:sqlite-jdbc-3.51.0.0.jar:sorma_generated.jar" \
+-classpath ".:sqlite-jdbc-3.51.1.0.jar:sorma_generated.jar" \
 org/example/TestSorma || exit 1
 

sorma2/gen/com/zoffcc/applications/sorm/OrmaDatabase.java

@@ -620,28 +620,28 @@ public static void init(final int db_schema_version) throws Exception
             // HINT: try to read "PRAGMA user_version" and see if there is some legacy value there
             current_db_schema_version = get_current_db_legacy_version();
         }
-        Log.i(TAG, "trifa:current_db_version=" + current_db_schema_version);
+        Log.i(TAG, "INIT:current_db_version=" + current_db_schema_version);
         if ((current_db_schema_version < 0) || (THIS_DB_SCHEMA_VERSION < 0))
         {
-            Log.i(TAG, "trifa:current_db_schema_version and/or THIS_DB_SCHEMA_VERSION are negative numbers, this is not allowed!");
+            Log.i(TAG, "INIT:current_db_schema_version and/or THIS_DB_SCHEMA_VERSION are negative numbers, this is not allowed!");
         }
         if ((current_db_schema_version == 0) && (THIS_DB_SCHEMA_VERSION == 0))
         {
-            Log.i(TAG, "trifa:current_db_schema_version and THIS_DB_SCHEMA_VERSION are both 0, this is not allowed!");
+            Log.i(TAG, "INIT:current_db_schema_version and THIS_DB_SCHEMA_VERSION are both 0, this is not allowed!");
         }
         if (current_db_schema_version < THIS_DB_SCHEMA_VERSION)
         {
             for (int cur=current_db_schema_version;cur<THIS_DB_SCHEMA_VERSION;cur++)
             {
-                Log.i(TAG, "trifa:calling schema upgrade callback function for " + cur + " -> " + (cur + 1));
+                Log.i(TAG, "INIT:calling schema upgrade callback function for " + cur + " -> " + (cur + 1));
                 if (schema_upgrade_callback_function != null)
                 {
                     schema_upgrade_callback_function.upgrade(cur, (cur + 1));
                 }
             }
         }
         current_db_schema_version = update_db(current_db_schema_version);
-        Log.i(TAG, "trifa:new_db_version=" + current_db_schema_version);
+        Log.i(TAG, "INIT:new_db_version=" + current_db_schema_version);
         // --------------- CREATE THE DATABASE ---------------
         // --------------- CREATE THE DATABASE ---------------
         // --------------- CREATE THE DATABASE ---------------

sorma2/o1.txt

@@ -620,28 +620,28 @@ public class OrmaDatabase
             // HINT: try to read "PRAGMA user_version" and see if there is some legacy value there
             current_db_schema_version = get_current_db_legacy_version();
         }
-        Log.i(TAG, "trifa:current_db_version=" + current_db_schema_version);
+        Log.i(TAG, "INIT:current_db_version=" + current_db_schema_version);
         if ((current_db_schema_version < 0) || (THIS_DB_SCHEMA_VERSION < 0))
         {
-            Log.i(TAG, "trifa:current_db_schema_version and/or THIS_DB_SCHEMA_VERSION are negative numbers, this is not allowed!");
+            Log.i(TAG, "INIT:current_db_schema_version and/or THIS_DB_SCHEMA_VERSION are negative numbers, this is not allowed!");
         }
         if ((current_db_schema_version == 0) && (THIS_DB_SCHEMA_VERSION == 0))
         {
-            Log.i(TAG, "trifa:current_db_schema_version and THIS_DB_SCHEMA_VERSION are both 0, this is not allowed!");
+            Log.i(TAG, "INIT:current_db_schema_version and THIS_DB_SCHEMA_VERSION are both 0, this is not allowed!");
         }
         if (current_db_schema_version < THIS_DB_SCHEMA_VERSION)
         {
             for (int cur=current_db_schema_version;cur<THIS_DB_SCHEMA_VERSION;cur++)
             {
-                Log.i(TAG, "trifa:calling schema upgrade callback function for " + cur + " -> " + (cur + 1));
+                Log.i(TAG, "INIT:calling schema upgrade callback function for " + cur + " -> " + (cur + 1));
                 if (schema_upgrade_callback_function != null)
                 {
                     schema_upgrade_callback_function.upgrade(cur, (cur + 1));
                 }
             }
         }
         current_db_schema_version = update_db(current_db_schema_version);
-        Log.i(TAG, "trifa:new_db_version=" + current_db_schema_version);
+        Log.i(TAG, "INIT:new_db_version=" + current_db_schema_version);
         // --------------- CREATE THE DATABASE ---------------
         // --------------- CREATE THE DATABASE ---------------
         // --------------- CREATE THE DATABASE ---------------