diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6020ae0 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +HyperSQLOOo.update.xml diff --git a/HyperSQLOOo.update.xml b/HyperSQLOOo.update.xml deleted file mode 100644 index c59f383..0000000 --- a/HyperSQLOOo.update.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - HyperSQLOOo - HyperSQLOOo - - - - - - diff --git a/README.md b/README.md index ef5cd25..a5261bd 100644 --- a/README.md +++ b/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]: [3]: [4]: -[5]: +[5]: [6]: [7]: [8]: @@ -346,7 +350,7 @@ ___ [23]: [24]: [25]: -[26]: +[26]: [27]: [28]: [29]: diff --git a/README_fr.md b/README_fr.md index a8d7888..541122e 100644 --- a/README_fr.md +++ b/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]: [3]: [4]: -[5]: +[5]: [6]: [7]: [8]: @@ -346,7 +350,7 @@ ___ [23]: [24]: [25]: -[26]: +[26]: [27]: [28]: [29]: diff --git a/source/HyperSQLOOo/description.xml b/source/HyperSQLOOo/description.xml index 8f849b6..a838497 100644 --- a/source/HyperSQLOOo/description.xml +++ b/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"> - + - - + + diff --git a/uno/.gitrepo b/uno/.gitrepo index f564fb7..d3fa444 100644 --- a/uno/.gitrepo +++ b/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 diff --git a/uno/lib/java/UnoHelper/UnoHelper.jar b/uno/lib/java/UnoHelper/UnoHelper.jar index 5bd8c1b..977a88f 100644 Binary files a/uno/lib/java/UnoHelper/UnoHelper.jar and b/uno/lib/java/UnoHelper/UnoHelper.jar differ diff --git a/uno/lib/python/_cffi_backend.cp310-win_amd64.pyd b/uno/lib/python/_cffi_backend.cp310-win_amd64.pyd new file mode 100644 index 0000000..9261519 Binary files /dev/null and b/uno/lib/python/_cffi_backend.cp310-win_amd64.pyd differ diff --git a/uno/lib/python/_cffi_backend.cp311-win_amd64.pyd b/uno/lib/python/_cffi_backend.cp311-win_amd64.pyd new file mode 100644 index 0000000..9bb0309 Binary files /dev/null and b/uno/lib/python/_cffi_backend.cp311-win_amd64.pyd differ diff --git a/uno/lib/python/charset_normalizer/md.cp310-win_amd64.pyd b/uno/lib/python/charset_normalizer/md.cp310-win_amd64.pyd new file mode 100644 index 0000000..b5333c7 Binary files /dev/null and b/uno/lib/python/charset_normalizer/md.cp310-win_amd64.pyd differ diff --git a/uno/lib/python/charset_normalizer/md.cp311-win_amd64.pyd b/uno/lib/python/charset_normalizer/md.cp311-win_amd64.pyd new file mode 100644 index 0000000..2f2835b Binary files /dev/null and b/uno/lib/python/charset_normalizer/md.cp311-win_amd64.pyd differ diff --git a/uno/lib/python/charset_normalizer/md__mypyc.cp310-win_amd64.pyd b/uno/lib/python/charset_normalizer/md__mypyc.cp310-win_amd64.pyd new file mode 100644 index 0000000..be04ce1 Binary files /dev/null and b/uno/lib/python/charset_normalizer/md__mypyc.cp310-win_amd64.pyd differ diff --git a/uno/lib/python/charset_normalizer/md__mypyc.cp311-win_amd64.pyd b/uno/lib/python/charset_normalizer/md__mypyc.cp311-win_amd64.pyd new file mode 100644 index 0000000..b51af72 Binary files /dev/null and b/uno/lib/python/charset_normalizer/md__mypyc.cp311-win_amd64.pyd differ diff --git a/uno/lib/python/ijson/backends/_yajl2.cp310-win_amd64.pyd b/uno/lib/python/ijson/backends/_yajl2.cp310-win_amd64.pyd new file mode 100644 index 0000000..c8cdf2e Binary files /dev/null and b/uno/lib/python/ijson/backends/_yajl2.cp310-win_amd64.pyd differ diff --git a/uno/lib/python/ijson/backends/_yajl2.cp311-win_amd64.pyd b/uno/lib/python/ijson/backends/_yajl2.cp311-win_amd64.pyd new file mode 100644 index 0000000..8c65b2d Binary files /dev/null and b/uno/lib/python/ijson/backends/_yajl2.cp311-win_amd64.pyd differ diff --git a/uno/lib/python/lxml/_elementpath.cp310-win_amd64.pyd b/uno/lib/python/lxml/_elementpath.cp310-win_amd64.pyd new file mode 100644 index 0000000..7eaebd7 Binary files /dev/null and b/uno/lib/python/lxml/_elementpath.cp310-win_amd64.pyd differ diff --git a/uno/lib/python/lxml/_elementpath.cp311-win_amd64.pyd b/uno/lib/python/lxml/_elementpath.cp311-win_amd64.pyd new file mode 100644 index 0000000..7243889 Binary files /dev/null and b/uno/lib/python/lxml/_elementpath.cp311-win_amd64.pyd differ diff --git a/uno/lib/python/lxml/builder.cp310-win_amd64.pyd b/uno/lib/python/lxml/builder.cp310-win_amd64.pyd new file mode 100644 index 0000000..b9ef3cc Binary files /dev/null and b/uno/lib/python/lxml/builder.cp310-win_amd64.pyd differ diff --git a/uno/lib/python/lxml/builder.cp311-win_amd64.pyd b/uno/lib/python/lxml/builder.cp311-win_amd64.pyd new file mode 100644 index 0000000..76cd287 Binary files /dev/null and b/uno/lib/python/lxml/builder.cp311-win_amd64.pyd differ diff --git a/uno/lib/python/lxml/etree.cp310-win_amd64.pyd b/uno/lib/python/lxml/etree.cp310-win_amd64.pyd new file mode 100644 index 0000000..fc206a5 Binary files /dev/null and b/uno/lib/python/lxml/etree.cp310-win_amd64.pyd differ diff --git a/uno/lib/python/lxml/etree.cp311-win_amd64.pyd b/uno/lib/python/lxml/etree.cp311-win_amd64.pyd new file mode 100644 index 0000000..bc062ce Binary files /dev/null and b/uno/lib/python/lxml/etree.cp311-win_amd64.pyd differ diff --git a/uno/lib/python/lxml/html/diff.cp310-win_amd64.pyd b/uno/lib/python/lxml/html/diff.cp310-win_amd64.pyd new file mode 100644 index 0000000..44aedbe Binary files /dev/null and b/uno/lib/python/lxml/html/diff.cp310-win_amd64.pyd differ diff --git a/uno/lib/python/lxml/html/diff.cp311-win_amd64.pyd b/uno/lib/python/lxml/html/diff.cp311-win_amd64.pyd new file mode 100644 index 0000000..7577cb7 Binary files /dev/null and b/uno/lib/python/lxml/html/diff.cp311-win_amd64.pyd differ diff --git a/uno/lib/python/lxml/objectify.cp310-win_amd64.pyd b/uno/lib/python/lxml/objectify.cp310-win_amd64.pyd new file mode 100644 index 0000000..bffcadf Binary files /dev/null and b/uno/lib/python/lxml/objectify.cp310-win_amd64.pyd differ diff --git a/uno/lib/python/lxml/objectify.cp311-win_amd64.pyd b/uno/lib/python/lxml/objectify.cp311-win_amd64.pyd new file mode 100644 index 0000000..d0e6b57 Binary files /dev/null and b/uno/lib/python/lxml/objectify.cp311-win_amd64.pyd differ diff --git a/uno/lib/python/lxml/sax.cp310-win_amd64.pyd b/uno/lib/python/lxml/sax.cp310-win_amd64.pyd new file mode 100644 index 0000000..0b48319 Binary files /dev/null and b/uno/lib/python/lxml/sax.cp310-win_amd64.pyd differ diff --git a/uno/lib/python/lxml/sax.cp311-win_amd64.pyd b/uno/lib/python/lxml/sax.cp311-win_amd64.pyd new file mode 100644 index 0000000..2b3dd1f Binary files /dev/null and b/uno/lib/python/lxml/sax.cp311-win_amd64.pyd differ diff --git a/uno/lib/uno/jdbcdriver/configuration.py b/uno/lib/uno/jdbcdriver/configuration.py index 55fbe91..7650d1e 100644 --- a/uno/lib/uno/jdbcdriver/configuration.py +++ b/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' diff --git a/uno/lib/uno/oauth20/configuration.py b/uno/lib/uno/oauth20/configuration.py index 1d9a3b9..1574f4e 100644 --- a/uno/lib/uno/oauth20/configuration.py +++ b/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}' diff --git a/uno/lib/uno/options/jdbc/optionmanager.py b/uno/lib/uno/options/jdbc/optionmanager.py index 5d39212..2f8f4d3 100644 --- a/uno/lib/uno/options/jdbc/optionmanager.py +++ b/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) diff --git a/uno/lib/uno/options/jdbc/optionmodel.py b/uno/lib/uno/options/jdbc/optionmodel.py index 0bc00b1..680827c 100644 --- a/uno/lib/uno/options/jdbc/optionmodel.py +++ b/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 diff --git a/uno/lib/uno/options/jdbc/optionview.py b/uno/lib/uno/options/jdbc/optionview.py index d86d256..866dbdb 100644 --- a/uno/lib/uno/options/jdbc/optionview.py +++ b/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) diff --git a/uno/rdb/idl/com/sun/star/rest/XRequestResponse.idl b/uno/rdb/idl/com/sun/star/rest/XRequestResponse.idl index da694a4..613c8d4 100644 --- a/uno/rdb/idl/com/sun/star/rest/XRequestResponse.idl +++ b/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;