V1.2.2

.gitignore

@@ -0,0 +1 @@
+HyperSQLOOo.update.xml

README.md

@@ -29,7 +29,7 @@
 
 **The use of this software subjects you to our [Terms Of Use][4].**
 
-# version [1.2.1][5]
+# version [1.2.2][5]
 
 ## Introduction:
 
@@ -318,7 +318,11 @@ ___
 - Many fixes that prevented proper functioning have been made to the driver written in Python and wrapping the driver that jdbcDriverOOo provides.
 - Requires the **jdbcDriverOOo extension at least version 1.5.1**.
 
-### What remains to be done for version 1.2.1:
+### What has been done for version 1.2.2:
+
+- Requires the **jdbcDriverOOo extension at least version 1.5.4**.
+
+### What remains to be done for version 1.2.2:
 
 - Add new language for internationalization...
 
@@ -328,7 +332,7 @@ ___
 [2]: <https://prrvchr.github.io/HyperSQLOOo/>
 [3]: <https://prrvchr.github.io/HyperSQLOOo/README_fr>
 [4]: <https://prrvchr.github.io/HyperSQLOOo/source/HyperSQLOOo/registration/TermsOfUse_en>
-[5]: <https://prrvchr.github.io/HyperSQLOOo#what-has-been-done-for-version-121>
+[5]: <https://prrvchr.github.io/HyperSQLOOo#what-has-been-done-for-version-122>
 [6]: <https://prrvchr.github.io/>
 [7]: <https://www.libreoffice.org/download/download/>
 [8]: <https://www.openoffice.org/download/index.html>
@@ -346,7 +350,7 @@ ___
 [23]: <https://img.shields.io/github/v/tag/prrvchr/jdbcDriverOOo?label=latest#right>
 [24]: <img/HyperSQLOOo.svg#middle>
 [25]: <https://github.com/prrvchr/HyperSQLOOo/releases/latest/download/HyperSQLOOo.oxt>
-[26]: <https://img.shields.io/github/downloads/prrvchr/HyperSQLOOo/latest/total?label=v1.2.1#right>
+[26]: <https://img.shields.io/github/downloads/prrvchr/HyperSQLOOo/latest/total?label=v1.2.2#right>
 [27]: <img/HyperSQLOOo-1.png>
 [28]: <img/HyperSQLOOo-2.png>
 [29]: <img/HyperSQLOOo-3.png>

README_fr.md

@@ -29,7 +29,7 @@
 
 **L'utilisation de ce logiciel vous soumet à nos [Conditions d'utilisation][4].**
 
-# version [1.2.1][5]
+# version [1.2.2][5]
 
 ## Introduction:
 
@@ -318,7 +318,11 @@ ___
 - De nombreuses corrections qui empêchaient le bon fonctionnement ont été apportées au pilote écrit en Python et enveloppant le pilote fourni par jdbcDriverOOo.
 - Nécessite l'extension **jdbcDriverOOo en version 1.5.1 minimum**.
 
-### Que reste-t-il à faire pour la version 1.2.1:
+### Ce qui a été fait pour la version 1.2.2:
+
+- Nécessite l'extension **jdbcDriverOOo en version 1.5.4 minimum**.
+
+### Que reste-t-il à faire pour la version 1.2.2:
 
 - Ajouter de nouvelles langue pour l'internationalisation...
 
@@ -328,7 +332,7 @@ ___
 [2]: <https://prrvchr.github.io/HyperSQLOOo/>
 [3]: <https://prrvchr.github.io/HyperSQLOOo/>
 [4]: <https://prrvchr.github.io/HyperSQLOOo/source/HyperSQLOOo/registration/TermsOfUse_fr>
-[5]: <https://prrvchr.github.io/HyperSQLOOo/README_fr#ce-qui-a-%C3%A9t%C3%A9-fait-pour-la-version-121>
+[5]: <https://prrvchr.github.io/HyperSQLOOo/README_fr#ce-qui-a-%C3%A9t%C3%A9-fait-pour-la-version-122>
 [6]: <https://prrvchr.github.io/README_fr>
 [7]: <https://fr.libreoffice.org/download/telecharger-libreoffice/>
 [8]: <https://www.openoffice.org/fr/Telecharger/>
@@ -346,7 +350,7 @@ ___
 [23]: <https://img.shields.io/github/v/tag/prrvchr/jdbcDriverOOo?label=latest#right>
 [24]: <img/HyperSQLOOo.svg#middle>
 [25]: <https://github.com/prrvchr/HyperSQLOOo/releases/latest/download/HyperSQLOOo.oxt>
-[26]: <https://img.shields.io/github/downloads/prrvchr/HyperSQLOOo/latest/total?label=v1.2.1#right>
+[26]: <https://img.shields.io/github/downloads/prrvchr/HyperSQLOOo/latest/total?label=v1.2.2#right>
 [27]: <img/HyperSQLOOo-1_fr.png>
 [28]: <img/HyperSQLOOo-2_fr.png>
 [29]: <img/HyperSQLOOo-3_fr.png>

source/HyperSQLOOo/description.xml

@@ -28,12 +28,12 @@
              xmlns:d="http://openoffice.org/extensions/description/2006"
              xmlns:l="http://libreoffice.org/extensions/description/2011"
              xmlns:xlink="http://www.w3.org/1999/xlink">
-  <version value="1.2.1"/>
+  <version value="1.2.2"/>
   <identifier value="io.github.prrvchr.HyperSQLOOo"/>
   <platform value="all"/>
   <dependencies>
-    <OpenOffice.org-minimal-version value="LibreOffice 6.0" d:name="LibreOffice 6.0"/>
-    <l:LibreOffice-minimal-version value="6.0" d:name="LibreOffice 6.0"/>
+    <d:OpenOffice.org-minimal-version value="6.0" d:name="LibreOffice 6.0"/>
+    <l:LibreOffice-minimal-version value="6.0" l:name="LibreOffice 6.0"/>
   </dependencies>
   <update-information>
     <src xlink:href="https://github.com/prrvchr/HyperSQLOOo/releases/latest/download/HyperSQLOOo.update.xml"/>

uno/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/prrvchr/uno.git
 	branch = main
-	commit = 842ae0843773fd50f2e6568d4d38a6408471a1af
-	parent = 3a52593b20cd69d22e6bf18c9e5aee0e7da2162b
+	commit = 66e9aea6994add573be9c1556b90c87449543a11
+	parent = 1597a53409658078944bc6348a59826b01fad6d8
 	method = merge
-	cmdver = 0.4.3
+	cmdver = 0.4.9

uno/lib/uno/jdbcdriver/configuration.py

@@ -34,4 +34,4 @@
 g_services = ('io.github.prrvchr.jdbcdriver.sdbc.Driver',
               'io.github.prrvchr.jdbcdriver.sdbcx.Driver',
               'io.github.prrvchr.jdbcdriver.sdb.Driver')
-g_version = '1.5.1'
+g_version = '1.5.4'

uno/lib/uno/oauth20/configuration.py

@@ -33,7 +33,7 @@
 g_service = '%s.OAuth2Service' % g_identifier
 g_resource = 'resource'
 
-g_version = '1.5.0'
+g_version = '1.5.2'
 g_chunk = g_chunk = 320 * 1024
 
 g_token = 'Bearer ${AccessToken}'

uno/lib/uno/options/jdbc/optionmanager.py

@@ -69,7 +69,7 @@ def loadSetting(self):
         self._initView()
 
     def setApiLevel(self, level):
-        self._model.setApiLevel(level)
+        self._view.enableCachedRowSet(self._model.setApiLevel(level))
 
     def setCachedRowSet(self, level):
         self._model.setCachedRowSet(level)

uno/lib/uno/options/jdbc/optionmodel.py

@@ -58,11 +58,12 @@ def getViewData(self):
         level = self._settings.get('ApiLevel')
         crs = self._settings.get('CachedRowSet')
         system = self._settings.get('ShowSystemTable')
-        return level, crs, system
+        return level, crs, system, self._isRowSetEnabled(level)
 
 # OptionModel setter methods
     def setApiLevel(self, level):
         self._settings['ApiLevel'] = level
+        return self._isRowSetEnabled(level)
 
     def setCachedRowSet(self, level):
         self._settings['CachedRowSet'] = level
@@ -89,3 +90,5 @@ def _getSettings(self):
             settings[key] = self._config.getByName(key)
         return settings
 
+    def _isRowSetEnabled(self, level):
+        return level != 0

uno/lib/uno/options/jdbc/optionview.py

@@ -47,11 +47,16 @@ def __init__(self, ctx, window, handler, options, restart, offset):
     def dispose(self):
         self._window.dispose()
 
-    def initView(self, level, crs, system):
+    def initView(self, level, crs, system, enabled):
         self._getApiLevel(level).State = 1
         self._getCachedRowSet(crs).State = 1
+        self.enableCachedRowSet(enabled)
         self._getSytemTable().State = int(system)
 
+    def enableCachedRowSet(self, enabled):
+        for crs in range(3):
+            self._getCachedRowSet(crs).Model.Enabled = enabled
+
     def setRestart(self, enabled):
         self._getRestart().setVisible(enabled)
 

uno/rdb/idl/com/sun/star/rest/XRequestResponse.idl

@@ -64,7 +64,8 @@ interface XRequestResponse: com::sun::star::uno::XInterface
                                                       [in] boolean DecodeUnicode,
                                                       [in] string Delimiter);
 
-    com::sun::star::io::XInputStream getInputStream([in] long Chunk);
+    com::sun::star::io::XInputStream getInputStream([in] long ChunkSize,
+                                                    [in] boolean DecodeUnicode);
 
 
     [attribute] string Encoding;