v0.0.4 update

prrvchr · Jan 9, 2023 · 964968a · 964968a
1 parent b874dfc
commit 964968a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 5 deletions.
diff --git a/HsqlDBembeddedOOo.oxt b/HsqlDBembeddedOOo.oxt
diff --git a/source/HsqlDBembeddedOOo/Driver.py b/source/HsqlDBembeddedOOo/Driver.py
@@ -87,6 +87,7 @@ def __init__(self, ctx):
     # XDriver
     def connect(self, url, infos):
         try:
+            print("HsqlDBDRiverOOo.Driver.connect() 1 Url: %s" % url)
             transformer = getUrlTransformer(self.ctx)
             location = self._getUrl(transformer, infos)
             if location is None:
@@ -221,10 +222,10 @@ def _getDataSource(self, transformer, url, name):
 
     def _setDataSource(self, datasource, transformer, url, name):
         datasource.URL = self._getDataSourceUrl(transformer, url, name)
-        print("Driver._setDataSource() URL: %s" % datasource.URL)
-        datasource.Settings.JavaDriverClass = g_class
-        path = getDataSourceClassPath(self.ctx, g_identifier)
-        datasource.Settings.JavaDriverClassPath = path
+        print("HsqlDBDRiverOOo.Driver._setDataSource() URL: %s" % datasource.URL)
+        #datasource.Settings.JavaDriverClass = g_class
+        #path = getDataSourceClassPath(self.ctx, g_identifier)
+        #datasource.Settings.JavaDriverClassPath = path
 
     def _getDataSourceUrl(self, transformer, url, name):
         format = (g_protocol, url.Protocol, url.Path, name, name, g_options, g_shutdown)

diff --git a/source/HsqlDBembeddedOOo/Drivers.xcu b/source/HsqlDBembeddedOOo/Drivers.xcu
@@ -38,6 +38,23 @@
                 <value xml:lang="en-US">Embedded HsqlDB Driver</value>
                 <value xml:lang="fr-FR">Pilote HsqlDB intégré</value>
             </prop>
+            <node oor:name="Properties">
+                <node oor:name="AutoIncrementCreation" oor:op="replace">
+                    <prop oor:name="Value" oor:type="xs:string">
+                        <value>GENERATED BY DEFAULT AS IDENTITY</value>
+                    </prop>
+                </node>
+                <node oor:name="AutoRetrievingStatement" oor:op="replace">
+                    <prop oor:name="Value" oor:type="xs:string">
+                        <value>CALL IDENTITY()</value>
+                    </prop>
+                </node>
+                <node oor:name="IsAutoRetrievingEnabled" oor:op="replace">
+                    <prop oor:name="Value" oor:type="xs:boolean">
+                        <value>true</value>
+                    </prop>
+                </node>
+            </node>
             <node oor:name="Features">
                 <node oor:name="EscapeDateTime" oor:op="replace">
                     <prop oor:name="Value" oor:type="xs:boolean">

diff --git a/source/HsqlDBembeddedOOo/dist/HsqlDBembeddedOOo.oxt b/source/HsqlDBembeddedOOo/dist/HsqlDBembeddedOOo.oxt
diff --git a/uno/lib/uno/database/dbconfig.py b/uno/lib/uno/database/dbconfig.py
@@ -28,7 +28,7 @@
 """
 
 # DataSource configuration
-g_protocol = 'jdbc:hsqldb:'
+g_protocol = 'xdbc:hsqldb:'
 g_path = 'hsqldb'
 g_jar = 'hsqldb.jar'
 g_class = 'org.hsqldb.jdbcDriver'