git subrepo pull uno

subrepo:
  subdir:   "uno"
  merged:   "68a4debd"
upstream:
  origin:   "https://github.com/prrvchr/uno.git"
  branch:   "main"
  commit:   "68a4debd"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

Author: prrvchr

uno/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/prrvchr/uno.git
 	branch = main
-	commit = 234d1d1a73ce548d863c87739dd1b54e35de5a18
-	parent = d3110b65f1a146d7880f02c26f824f0b0ddcf727
+	commit = 68a4debdee70a3060b5014982affc0edb700f278
+	parent = a47bd4b2829e0706b912e6acbf12c3df8887fc4a
 	method = merge
 	cmdver = 0.4.3

uno/lib/uno/card/card/database.py

@@ -105,7 +105,7 @@ def isUptoDate(self):
         return checkVersion(self._version, g_version)
 
     def getConnection(self, user='', password=''):
-        return getDataSourceConnection(self._ctx, self._url, user, password, False)
+        return getDataSourceConnection(self._ctx, self._url, user, password)
 
     def dispose(self):
         if self._statement is not None:

uno/lib/uno/dbtool/dbtool.py

@@ -106,7 +106,7 @@ def getConnectionUrl(ctx, path):
     location = getResourceLocation(ctx, g_identifier, path)
     return getUrlPresentation(ctx, location)
 
-def getDataSourceConnection(ctx, url, name='', password='', create=True, infos=None, isolated=True):
+def getDataSourceConnection(ctx, url, name='', password='', create=False, infos=None, isolated=True):
     if create:
         # XXX: The connection infos must be given to the creation
         datasource = createDataSource(ctx, url, infos)

uno/lib/uno/options/addressbook/optionsmanager.py

@@ -42,7 +42,7 @@
 
 
 class OptionsManager():
-    def __init__(self, ctx, window, logger, offset=0):
+    def __init__(self, ctx, logger, window, offset=0):
         self._ctx = ctx
         self._logger = logger
         self._model = OptionsModel(ctx)

uno/lib/uno/options/ucb/optionsmanager.py

@@ -30,34 +30,43 @@
 from com.sun.star.logging.LogLevel import INFO
 from com.sun.star.logging.LogLevel import SEVERE
 
+from com.sun.star.uno import Exception as UnoException
+
 from .optionsmodel import OptionsModel
 from .optionsview import OptionsView
 
 from ..unotool import executeDispatch
 from ..unotool import getDesktop
 from ..unotool import getFilePicker
-from ..unotool import createService
 
-from ..logger import getLogger
+from ..helper import getDataBaseConnection
+from ..helper import getDataBaseUrl
+
 from ..logger import LogManager
 
-from ..configuration import g_identifier
 from ..configuration import g_defaultlog
 from ..configuration import g_synclog
 
 import traceback
 
 
 class OptionsManager():
-    def __init__(self, ctx, window):
+    def __init__(self, ctx, source, logger, window):
         self._ctx = ctx
-        self._logger = getLogger(ctx, g_defaultlog)
+        self._logger = logger
         self._model = OptionsModel(ctx)
         self._view = OptionsView(window, *self._model.getInitData())
         self._logmanager = LogManager(ctx, window, 'requirements.txt', g_defaultlog, g_synclog)
         self._logmanager.initView()
         self._view.setViewData(*self._model.getViewData(OptionsManager._restart))
         self._logger.logprb(INFO, 'OptionsManager', '__init__', 151)
+        try:
+            url = getDataBaseUrl(ctx)
+            connection = getDataBaseConnection(ctx, source, logger, url, False, False)
+        except UnoException as e:
+            logger.logprb(SEVERE, 'OptionsManager', '__init__', 152, e.Message)
+        else:
+            connection.close()
 
     _restart = False
 
@@ -110,4 +119,3 @@ def enableMacro(self, enabled):
 
     def customizeMenu(self):
         executeDispatch(self._ctx, '.uno:ConfigureDialog')
-

uno/lib/uno/ucb/__init__.py

@@ -40,4 +40,5 @@
 from .configuration import g_identifier
 from .configuration import g_basename
 from .configuration import g_defaultlog
+from .configuration import g_scheme
 

uno/lib/uno/ucb/contentprovider.py

@@ -50,20 +50,10 @@
 from .unotool import getUrlTransformer
 from .unotool import parseUrl
 
-from .helper import getDataSourceUrl
+from .helper import getDataBaseConnection
+from .helper import getDataBaseUrl
 from .helper import getExceptionMessage
 from .helper import getPresentationUrl
-from .helper import showWarning
-
-from .logger import getLogger
-
-from .jdbcdriver import g_extension as g_jdbcext
-
-from .dbconfig import g_version
-
-from .configuration import g_extension
-from .configuration import g_identifier
-from .configuration import g_defaultlog
 
 import traceback
 
@@ -73,7 +63,7 @@ class ContentProvider(unohelper.Base,
                       XContentIdentifierFactory,
                       XContentProvider):
     def __init__(self, ctx, logger, implementation, authority, arguments):
-        self._cls = f'{arguments}ContentProvider'
+        self._cls = '%sContentProvider' % arguments
         self._ctx = ctx
         self._implementation = implementation
         self._authority = authority
@@ -87,8 +77,9 @@ def __init__(self, ctx, logger, implementation, authority, arguments):
     @property
     def _datasource(self):
         if ContentProvider.__datasource is None:
-            url = getDataSourceUrl(self._ctx, self, self._logger)
-            datasource = DataSource(self._ctx, self, self._logger, url)
+            url = getDataBaseUrl(self._ctx)
+            connection = getDataBaseConnection(self._ctx, self, self._logger, url)
+            datasource = DataSource(self._ctx, self._logger, connection, url)
             ContentProvider.__datasource = datasource
         return ContentProvider.__datasource
 
@@ -101,6 +92,7 @@ def createContentIdentifier(self, url):
     # XContentProvider
     def queryContent(self, identifier):
         try:
+            content = None
             url = self._getPresentationUrl(identifier.getContentIdentifier())
             content = self._datasource.queryContent(self, self._authority, url)
             self._logger.logprb(INFO, self._cls, 'queryContent', 221, url)

uno/lib/uno/ucb/database.py

@@ -38,9 +38,7 @@
 
 from .dbtool import Array
 
-from .unotool import checkVersion
 from .unotool import generateUuid
-from .unotool import getSimpleFile
 
 from .dbqueries import getSqlQuery
 
@@ -50,52 +48,31 @@
 from .dbtool import getDataSourceCall
 from .dbtool import getDataFromResult
 
-from .dbinit import createDataBase
-from .dbinit import getDataBaseConnection
-
-from .helper import checkConnection
-from .helper import checkDatabaseVersion
+from .logger import getLogger
 
 from .dbconfig import g_role
 
+from .configuration import g_defaultlog
+
 import os
 import traceback
 
 
 class DataBase():
-    def __init__(self, ctx, source, logger, url, user='', pwd=''):
-        cls, mtd = 'DataBase', '__init__'
-        logger.logprb(INFO, cls, mtd, 401)
+    def __init__(self, ctx, connection, url):
         self._ctx = ctx
         self._url = url
-        odb = url + '.odb'
-        new = not getSimpleFile(ctx).exists(odb)
-        connection = getDataBaseConnection(ctx, url, user, pwd, new)
-        checkConnection(ctx, source, connection, logger, new)
-        version = connection.getMetaData().getDriverVersion()
-        if new:
-            logger.logprb(INFO, cls, mtd, 402, version)
-            createDataBase(ctx, connection, odb)
-            logger.logprb(INFO, cls, mtd, 403)
+        print("DataBase.__init__() url: %s" % self._url)
         self._statement = connection.createStatement()
-        self._version = version
-        self._logger = logger
-        logger.logprb(INFO, cls, mtd, 404)
 
     @property
     def Url(self):
         return self._url
-    @property
-    def Version(self):
-        return self._version
 
     @property
     def Connection(self):
         return self._statement.getConnection()
 
-    def isUptoDate(self):
-        return checkDatabaseVersion(self._version)
-
 # Procedures called by the DataSource
     def addCloseListener(self, listener):
         self.Connection.getParent().DatabaseDocument.addCloseListener(listener)
@@ -472,7 +449,7 @@ def _mergeItem(self, call, item):
             mx = 2 ** 32 / 2 -1
             if size > mx:
                 size = min(size, mx)
-                self._logger.logprb(SEVERE, 'DataBase', '_mergeItem', 451, size, item.get('Size'))
+                getLogger(self._ctx, g_defaultlog).logprb(SEVERE, 'DataBase', '_mergeItem', 401, os.name, item.get('Size'), size)
         call.setLong(10, size)
         call.setString(11, item.get('Link'))
         call.setBoolean(12, item.get('Trashed'))

uno/lib/uno/ucb/datasource.py

@@ -57,7 +57,7 @@
 
 
 class DataSource():
-    def __init__(self, ctx, source, logger, url):
+    def __init__(self, ctx, logger, connection, url):
         cls, mtd = 'DataSource', '__init__'
         logger.logprb(INFO, cls, mtd, 301)
         self._ctx = ctx
@@ -66,13 +66,11 @@ def __init__(self, ctx, source, logger, url):
         self._sync = Event()
         self._lock = Lock()
         self._urifactory = getUriFactory(ctx)
-        database = DataBase(ctx, source, logger, url)
-        provider = Provider(ctx, logger)
-        self._replicator = Replicator(ctx, url, provider, self._users, self._sync, self._lock)
-        self._database = database
-        self._provider = provider
+        self._database = DataBase(ctx, connection, url)
+        self._provider = Provider(ctx, logger)
+        self._replicator = Replicator(ctx, url, self._provider, self._users, self._sync, self._lock)
         self._logger = logger
-        database.addCloseListener(CloseListener(self))
+        self._database.addCloseListener(CloseListener(self))
         logger.logprb(INFO, cls, mtd, 302)
 
     @property
@@ -82,12 +80,6 @@ def DataBase(self):
     def Replicator(self):
         return self._replicator
 
-    def isUptoDate(self):
-        return self.DataBase.isUptoDate()
-
-    def getDataBaseVersion(self):
-        return self.DataBase.Version
-
     # called from XCloseListener
     def dispose(self):
         try:

uno/lib/uno/ucb/dbconfig.py

@@ -45,7 +45,7 @@
 g_options = ';hsqldb.default_table_type=cached;ifexists=false'
 g_shutdown = ';shutdown=true'
 g_csv = '%s.csv;fs=|;ignore_first=true;encoding=UTF-8;quoted=true'
-g_version = '2.7.2'
+g_version = '2.7.4'
 g_role = 'FrontOffice'
 
 g_catalog = 'PUBLIC'