Skip to content

Commit 3a52593

Browse files
prrvchrprrvchr
committed
new version 1.2.1
1 parent 455659e commit 3a52593

31 files changed

+185
-202
lines changed

‎HyperSQLOOo.update.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
xmlns:l="http://libreoffice.org/extensions/description/2011"
3030
xmlns:xlink="http://www.w3.org/1999/xlink">
3131
<identifier value="io.github.prrvchr.HyperSQLOOo"/>
32-
<version value="1.2.0"/>
32+
<version value="1.2.1"/>
3333
<update-download>
3434
<src xlink:href="https://github.com/prrvchr/HyperSQLOOo/releases/latest/download/HyperSQLOOo.oxt"/>
3535
</update-download>
@@ -42,7 +42,7 @@
4242
<name xlink:href="https://prrvchr.github.io/HyperSQLOOo/README_fr" lang="fr">HyperSQLOOo</name>
4343
</publisher>
4444
<release-notes>
45-
<src xlink:href="https://prrvchr.github.io/HyperSQLOOo/#what-has-been-done-for-version-120" lang="en"/>
46-
<src xlink:href="https://prrvchr.github.io/HyperSQLOOo/README_fr#ce-qui-a-%C3%A9t%C3%A9-fait-pour-la-version-120" lang="fr"/>
45+
<src xlink:href="https://prrvchr.github.io/HyperSQLOOo/#what-has-been-done-for-version-121" lang="en"/>
46+
<src xlink:href="https://prrvchr.github.io/HyperSQLOOo/README_fr#ce-qui-a-%C3%A9t%C3%A9-fait-pour-la-version-121" lang="fr"/>
4747
</release-notes>
4848
</description>

‎README.md‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
**The use of this software subjects you to our [Terms Of Use][4].**
3131

32-
# version [1.2.0][5]
32+
# version [1.2.1][5]
3333

3434
## Introduction:
3535

@@ -313,7 +313,12 @@ ___
313313
- Any errors occurring while loading the driver will be logged in the extension's log if logging has been previously enabled. This makes it easier to identify installation problems on Windows.
314314
- Requires the **jdbcDriverOOo extension at least version 1.5.0**.
315315

316-
### What remains to be done for version 1.2.0:
316+
### What has been done for version 1.2.1:
317+
318+
- Many fixes that prevented proper functioning have been made to the driver written in Python and wrapping the driver that jdbcDriverOOo provides.
319+
- Requires the **jdbcDriverOOo extension at least version 1.5.1**.
320+
321+
### What remains to be done for version 1.2.1:
317322

318323
- Add new language for internationalization...
319324

@@ -323,7 +328,7 @@ ___
323328
[2]: <https://prrvchr.github.io/HyperSQLOOo/>
324329
[3]: <https://prrvchr.github.io/HyperSQLOOo/README_fr>
325330
[4]: <https://prrvchr.github.io/HyperSQLOOo/source/HyperSQLOOo/registration/TermsOfUse_en>
326-
[5]: <https://prrvchr.github.io/HyperSQLOOo#what-has-been-done-for-version-120>
331+
[5]: <https://prrvchr.github.io/HyperSQLOOo#what-has-been-done-for-version-121>
327332
[6]: <https://prrvchr.github.io/>
328333
[7]: <https://www.libreoffice.org/download/download/>
329334
[8]: <https://www.openoffice.org/download/index.html>
@@ -341,7 +346,7 @@ ___
341346
[23]: <https://img.shields.io/github/v/tag/prrvchr/jdbcDriverOOo?label=latest#right>
342347
[24]: <img/HyperSQLOOo.svg#middle>
343348
[25]: <https://github.com/prrvchr/HyperSQLOOo/releases/latest/download/HyperSQLOOo.oxt>
344-
[26]: <https://img.shields.io/github/downloads/prrvchr/HyperSQLOOo/latest/total?label=v1.2.0#right>
349+
[26]: <https://img.shields.io/github/downloads/prrvchr/HyperSQLOOo/latest/total?label=v1.2.1#right>
345350
[27]: <img/HyperSQLOOo-1.png>
346351
[28]: <img/HyperSQLOOo-2.png>
347352
[29]: <img/HyperSQLOOo-3.png>

‎README_fr.md‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
**L'utilisation de ce logiciel vous soumet à nos [Conditions d'utilisation][4].**
3131

32-
# version [1.2.0][5]
32+
# version [1.2.1][5]
3333

3434
## Introduction:
3535

@@ -313,7 +313,12 @@ ___
313313
- Toute erreur survenant lors du chargement du pilote sera consignée dans le journal de l'extension si la journalisation a été préalablement activé. Cela facilite l'identification des problèmes d'installation sous Windows.
314314
- Nécessite l'extension **jdbcDriverOOo en version 1.5.0 minimum**.
315315

316-
### Que reste-t-il à faire pour la version 1.2.0:
316+
### Ce qui a été fait pour la version 1.2.1:
317+
318+
- 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.
319+
- Nécessite l'extension **jdbcDriverOOo en version 1.5.1 minimum**.
320+
321+
### Que reste-t-il à faire pour la version 1.2.1:
317322

318323
- Ajouter de nouvelles langue pour l'internationalisation...
319324

@@ -323,7 +328,7 @@ ___
323328
[2]: <https://prrvchr.github.io/HyperSQLOOo/>
324329
[3]: <https://prrvchr.github.io/HyperSQLOOo/>
325330
[4]: <https://prrvchr.github.io/HyperSQLOOo/source/HyperSQLOOo/registration/TermsOfUse_fr>
326-
[5]: <https://prrvchr.github.io/HyperSQLOOo/README_fr#ce-qui-a-%C3%A9t%C3%A9-fait-pour-la-version-120>
331+
[5]: <https://prrvchr.github.io/HyperSQLOOo/README_fr#ce-qui-a-%C3%A9t%C3%A9-fait-pour-la-version-121>
327332
[6]: <https://prrvchr.github.io/README_fr>
328333
[7]: <https://fr.libreoffice.org/download/telecharger-libreoffice/>
329334
[8]: <https://www.openoffice.org/fr/Telecharger/>
@@ -341,7 +346,7 @@ ___
341346
[23]: <https://img.shields.io/github/v/tag/prrvchr/jdbcDriverOOo?label=latest#right>
342347
[24]: <img/HyperSQLOOo.svg#middle>
343348
[25]: <https://github.com/prrvchr/HyperSQLOOo/releases/latest/download/HyperSQLOOo.oxt>
344-
[26]: <https://img.shields.io/github/downloads/prrvchr/HyperSQLOOo/latest/total?label=v1.2.0#right>
349+
[26]: <https://img.shields.io/github/downloads/prrvchr/HyperSQLOOo/latest/total?label=v1.2.1#right>
345350
[27]: <img/HyperSQLOOo-1_fr.png>
346351
[28]: <img/HyperSQLOOo-2_fr.png>
347352
[29]: <img/HyperSQLOOo-3_fr.png>

‎source/HyperSQLOOo/Options.xcs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,9 @@
3131
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3232
oor:package="io.github.prrvchr"
3333
oor:name="HyperSQLOOo">
34-
<component>
35-
<prop oor:name="ApiLevel" oor:type="xs:string"/>
36-
<prop oor:name="ShowSystemTable" oor:type="xs:boolean"/>
37-
<prop oor:name="UseBookmark" oor:type="xs:boolean"/>
38-
<prop oor:name="SQLMode" oor:type="xs:boolean"/>
39-
</component>
34+
<component>
35+
<prop oor:name="ApiLevel" oor:type="xs:int"/>
36+
<prop oor:name="CachedRowSet" oor:type="xs:int"/>
37+
<prop oor:name="ShowSystemTable" oor:type="xs:boolean"/>
38+
</component>
4039
</oor:component-schema>

‎source/HyperSQLOOo/Options.xcu‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,13 @@
3131
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3232
oor:package="io.github.prrvchr"
3333
oor:name="HyperSQLOOo">
34-
<prop oor:name="ApiLevel" oor:op="fuse">
35-
<value>com.sun.star.sdb</value>
36-
</prop>
37-
<prop oor:name="ShowSystemTable" oor:op="fuse">
38-
<value>false</value>
39-
</prop>
40-
<prop oor:name="UseBookmark" oor:op="fuse">
41-
<value>true</value>
42-
</prop>
43-
<prop oor:name="SQLMode" oor:op="fuse">
44-
<value>false</value>
45-
</prop>
34+
<prop oor:name="ApiLevel" oor:op="fuse">
35+
<value>2</value>
36+
</prop>
37+
<prop oor:name="CachedRowSet" oor:op="fuse">
38+
<value>1</value>
39+
</prop>
40+
<prop oor:name="ShowSystemTable" oor:op="fuse">
41+
<value>false</value>
42+
</prop>
4643
</oor:component-data>

‎source/HyperSQLOOo/description.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
xmlns:d="http://openoffice.org/extensions/description/2006"
2929
xmlns:l="http://libreoffice.org/extensions/description/2011"
3030
xmlns:xlink="http://www.w3.org/1999/xlink">
31-
<version value="1.2.0"/>
31+
<version value="1.2.1"/>
3232
<identifier value="io.github.prrvchr.HyperSQLOOo"/>
3333
<platform value="all"/>
3434
<dependencies>

‎source/HyperSQLOOo/service/Driver.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,20 +64,20 @@ def __new__(cls, ctx, *args, **kwargs):
6464
with cls._lock:
6565
if cls._instance is None:
6666
logger = getLogger(ctx, g_defaultlog, g_basename)
67-
apilevel = getConfiguration(ctx, g_identifier).getByName('ApiLevel')
68-
service = g_services[apilevel]
67+
level = getConfiguration(ctx, g_identifier).getByName('ApiLevel')
68+
service = g_services[level]
6969
try:
7070
checkConfiguration(ctx, logger)
71-
if apilevel == 'com.sun.star.sdbc':
71+
if level == 0:
7272
instance = sdbc.Driver(ctx, cls._lock, logger, service, g_ImplementationName)
7373
else:
7474
instance = sdbcx.Driver(ctx, cls._lock, logger, service, g_ImplementationName)
7575
cls._instance = instance
76-
logger.logprb(INFO, 'Driver', '__new__', 101, g_ImplementationName, apilevel)
76+
logger.logprb(INFO, 'Driver', '__new__', 101, g_ImplementationName, service)
7777
except UNOException as e:
7878
if cls._logger is None:
7979
cls._logger = logger
80-
logger.logprb(SEVERE, 'Driver', '__new__', 102, g_ImplementationName, apilevel, e.Message)
80+
logger.logprb(SEVERE, 'Driver', '__new__', 102, g_ImplementationName, service, e.Message)
8181
raise e
8282
return cls._instance
8383

‎source/HyperSQLOOo/service/OptionsHandler.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
from hypersql import g_defaultlog
4444
from hypersql import g_identifier
4545

46+
from hypersql import g_disabled
47+
from hypersql import g_memory
48+
4649
import traceback
4750

4851
# pythonloader looks for a static g_ImplementationHelper variable
@@ -57,15 +60,14 @@ def __init__(self, ctx):
5760
self._ctx = ctx
5861
self._manager = None
5962
self._logger = getLogger(ctx, g_defaultlog, g_basename)
60-
self._url = 'xdbc:hsqldb:mem:dbversion'
6163

6264
# XContainerWindowEventHandler
6365
def callHandlerMethod(self, window, event, method):
6466
try:
6567
handled = False
6668
if method == 'external_event':
6769
if event == 'initialize':
68-
self._manager = OptionsManager(self._ctx, self._logger, window, self._url)
70+
self._manager = OptionsManager(self._ctx, self._logger, window, g_disabled, g_memory)
6971
handled = True
7072
elif event == 'ok':
7173
self._manager.saveSetting()

‎source/HyperSQLOOo/service/pythonpath/hypersql/configuration.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,8 @@
4949
g_driver = ''
5050
g_shutdown = ''
5151

52+
g_disabled = ()
53+
g_memory = 'xdbc:hsqldb:mem:dbversion'
54+
5255
# LibreOffice configuration
5356
g_lover = '5.0'

‎uno/.gitrepo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[subrepo]
77
remote = https://github.com/prrvchr/uno.git
88
branch = main
9-
commit = 68a4debdee70a3060b5014982affc0edb700f278
10-
parent = a47bd4b2829e0706b912e6acbf12c3df8887fc4a
9+
commit = daa2b0a442fe9719f7e8464cbd5f410fe64849a6
10+
parent = 455659ed734290eb4fc4e9eee52e32f1f07dd290
1111
method = merge
1212
cmdver = 0.4.3

0 commit comments

Comments
 (0)