ci: tests for macOS on Gitlab CI

[nit.git] / lib / linux / data_store.nit

diff --git a/lib/linux/data_store.nit b/lib/linux/data_store.nit
index 3a017dc..95ddeb1 100644 (file)
--- a/lib/linux/data_store.nit
+++ b/lib/linux/data_store.nit
@@ -19,15 +19,10 @@ module data_store
 
 import app::data_store
 private import xdg_basedir
-private import sqlite3
-private import json_serialization
+import sqlite3
+private import json
 
-redef class App
-       redef var data_store = new LinuxStore
-end
-
-private class LinuxStore
-       super DataStore
+redef class DataStore
 
        # File path of the Sqlite3 DB file
        fun db_file: String do return "data_store.db"
@@ -35,7 +30,7 @@ private class LinuxStore
        # Sqlite3 table used
        fun db_table: String do return "data_store"
 
-       var db_cache: nullable Sqlite3DB = null
+       private var db_cache: nullable Sqlite3DB = null
 
        # Database to use to implement the `DataStore`
        fun db: nullable Sqlite3DB
@@ -45,14 +40,14 @@ private class LinuxStore
 
                # Find DB path
                var config_home = xdg_basedir.config_home.to_s
-               var config_dir = config_home.join_path(sys.program_name.basename(""))
+               var config_dir = config_home.join_path(sys.program_name.basename)
                if not config_dir.file_exists then config_dir.mkdir
                var db_path = config_dir.join_path(db_file)
 
                # Open DB connection
                db = new Sqlite3DB.open(db_path)
                if not db.is_open then
-                       app.log_error "Data store unavaible, cannot load/save data. (at '{db_path}' with '{db.error or else "unknown"}')"
+                       print_error "Data store unavaible, cannot load/save data. (at '{db_path}' with '{db.error or else "unknown"}')"
                        return null
                end
 
@@ -71,6 +66,7 @@ private class LinuxStore
 
                # Prepare SELECT statement
                var stmt = db.select("* FROM {db_table} WHERE key == {key.to_sql_string}")
+               if stmt == null then return null
 
                # Execute statment
                for row in stmt do
@@ -82,6 +78,13 @@ private class LinuxStore
                        var deserializer = new JsonDeserializer(serialized)
                        var deserialized = deserializer.deserialize
 
+                       var errors = deserializer.errors
+                       if errors.not_empty then
+                               # An update may have broken the versioning compatibility
+                               print_error "{class_name} error at deserialization: {errors.join(", ")}"
+                               return null # Let's be safe
+                       end
+
                        return deserialized
                end