new version 1.2.2

Author: prrvchr

README.md

@@ -29,7 +29,7 @@
 
 **The use of this software subjects you to our [Terms Of Use][4] and [Data Protection Policy][5].**
 
-# version [1.2.1][6]
+# version [1.2.2][6]
 
 ## Introduction:
 
@@ -410,7 +410,13 @@ ___
 - Fixed a regression allowing errors to be displayed in the Spooler.
 - Integration of a fix to workaround the [issue #159988][91].
 
-### What remains to be done for version 1.2.1:
+### What has been done for version 1.2.2:
+
+- The creation of the database, during the first connection, uses the UNO API offered by the jdbcDriverOOo extension since version 1.3.2. This makes it possible to record all the information necessary for creating the database in 5 text tables which are in fact [5 csv files][92].
+- The extension will ask you to install the OAuth2OOo and jdbcDriverOOo extensions in versions 1.3.4 and 1.3.2 respectively minimum.
+- Many fixes.
+
+### What remains to be done for version 1.2.2:
 
 - Add new languages for internationalization...
 
@@ -454,7 +460,7 @@ ___
 [37]: <https://img.shields.io/github/v/tag/prrvchr/mContactOOo?label=latest#right>
 [38]: <https://prrvchr.github.io/eMailerOOo/img/eMailerOOo.svg#middle>
 [39]: <https://github.com/prrvchr/eMailerOOo/releases/latest/download/eMailerOOo.oxt>
-[40]: <https://img.shields.io/github/downloads/prrvchr/eMailerOOo/latest/total?label=v1.2.1#right>
+[40]: <https://img.shields.io/github/downloads/prrvchr/eMailerOOo/latest/total?label=v1.2.2#right>
 [41]: <https://prrvchr.github.io/eMailerOOo/#merge-emails-with-mailing-lists>
 [42]: <https://prrvchr.github.io/eMailerOOo/#configure-connection>
 [43]: <https://prrvchr.github.io/eMailerOOo/#outgoing-emails>
@@ -506,3 +512,4 @@ ___
 [89]: <https://peps.python.org/pep-0508/>
 [90]: <https://prrvchr.github.io/eMailerOOo/#requirement>
 [91]: <https://bugs.documentfoundation.org/show_bug.cgi?id=159988>
+[92]: <https://github.com/prrvchr/eMailerOOo/tree/master/source/eMailerOOo/hsqldb>

README_fr.md

@@ -29,7 +29,7 @@
 
 **L'utilisation de ce logiciel vous soumet à nos [Conditions d'utilisation][4] et à notre [Politique de protection des données][5].**
 
-# version [1.2.1][6]
+# version [1.2.2][6]
 
 ## Introduction:
 
@@ -410,7 +410,13 @@ ___
 - Correction d'une régression permettant l'affichage des erreurs dans le Spooler.
 - Intégration d'un correctif pour contourner le [dysfonctionnement #159988][91].
 
-### Que reste-t-il à faire pour la version 1.2.1:
+### Ce qui a été fait pour la version 1.2.2:
+
+- La création de la base de données, lors de la première connexion, utilise l'API UNO proposée par l'extension jdbcDriverOOo depuis la version 1.3.2. Cela permet d'enregistrer toutes les informations nécessaires à la création de la base de données dans 5 tables texte qui sont en fait [5 fichiers csv][92].
+- L'extension vous demandera d'installer les extensions OAuth2OOo et jdbcDriverOOo en version respectivement 1.3.4 et 1.3.2 minimum.
+- De nombreuses corrections.
+
+### Que reste-t-il à faire pour la version 1.2.2:
 
 - Ajouter de nouvelles langues pour l’internationalisation...
 
@@ -454,7 +460,7 @@ ___
 [37]: <https://img.shields.io/github/v/tag/prrvchr/mContactOOo?label=latest#right>
 [38]: <https://prrvchr.github.io/eMailerOOo/img/eMailerOOo.svg#middle>
 [39]: <https://github.com/prrvchr/eMailerOOo/releases/latest/download/eMailerOOo.oxt>
-[40]: <https://img.shields.io/github/downloads/prrvchr/eMailerOOo/latest/total?label=v1.2.1#right>
+[40]: <https://img.shields.io/github/downloads/prrvchr/eMailerOOo/latest/total?label=v1.2.2#right>
 [41]: <https://prrvchr.github.io/eMailerOOo/README_fr#publipostage-de-courriels-avec-des-listes-de-diffusion>
 [42]: <https://prrvchr.github.io/eMailerOOo/README_fr#configuration-de-la-connexion>
 [43]: <https://prrvchr.github.io/eMailerOOo/README_fr#courriels-sortants>
@@ -506,3 +512,4 @@ ___
 [89]: <https://peps.python.org/pep-0508/>
 [90]: <https://prrvchr.github.io/eMailerOOo/README_fr#pr%C3%A9requis>
 [91]: <https://bugs.documentfoundation.org/show_bug.cgi?id=159988>
+[92]: <https://github.com/prrvchr/eMailerOOo/tree/master/source/eMailerOOo/hsqldb>

eMailerOOo.update.xml

@@ -28,7 +28,7 @@
   xmlns="http://openoffice.org/extensions/update/2006"
   xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="io.github.prrvchr.eMailerOOo"/>
-    <version value="1.2.1"/>
+    <version value="1.2.2"/>
     <update-download>
         <src xlink:href="https://github.com/prrvchr/eMailerOOo/releases/latest/download/eMailerOOo.oxt"/>
     </update-download>
@@ -40,7 +40,7 @@
         <name xlink:href="https://prrvchr.github.io/eMailerOOo/README_fr" lang="fr">eMailerOOo</name>
     </publisher>
     <release-notes>
-        <src xlink:href="https://prrvchr.github.io/eMailerOOo/#what-has-been-done-for-version-121" lang="en"/>
-        <src xlink:href="https://prrvchr.github.io/eMailerOOo/README_fr#ce-qui-a-%C3%A9t%C3%A9-fait-pour-la-version-121" lang="fr"/>
+        <src xlink:href="https://prrvchr.github.io/eMailerOOo/#what-has-been-done-for-version-122" lang="en"/>
+        <src xlink:href="https://prrvchr.github.io/eMailerOOo/README_fr#ce-qui-a-%C3%A9t%C3%A9-fait-pour-la-version-122" lang="fr"/>
     </release-notes>
 </description>

source/eMailerOOo/service/pythonpath/emailer/dbconfig.py

@@ -38,6 +38,9 @@
 g_role = 'FrontOffice'
 g_dba = 'AD'
 
+g_catalog = 'PUBLIC'
+g_schema  = 'PUBLIC'
+
 # XXX: If we want to be able to create DataBase we need to get some
 # XXX: DriverPropertyInfo from the driver. Here is the necessary information
 g_drvinfos = {'AutoIncrementCreation':   lambda x: x.Value,

source/eMailerOOo/service/pythonpath/emailer/dbinit.py

@@ -29,12 +29,15 @@
 
 from com.sun.star.sdbc import SQLException
 
+from com.sun.star.sdbcx import CheckOption
+
 from .dbtool import createStaticTables
 from .dbtool import createStaticIndexes
 from .dbtool import createStaticForeignKeys
 from .dbtool import createTables
 from .dbtool import createIndexes
 from .dbtool import createForeignKeys
+from .dbtool import createViews
 from .dbtool import executeQueries
 from .dbtool import getConnectionInfos
 from .dbtool import getDataBaseTables
@@ -48,6 +51,10 @@
 from .dbtool import getForeignKeys
 from .dbtool import setStaticTable
 
+from .dbqueries import getSqlQuery
+
+from .dbconfig import g_catalog
+from .dbconfig import g_schema
 from .dbconfig import g_csv
 from .dbconfig import g_drvinfos
 
@@ -65,14 +72,16 @@ def createDataBase(ctx, connection, odb):
     sleep(0.2)
     tables = connection.getTables()
     statement = connection.createStatement()
-    statics = createStaticTables(tables)
-    createStaticIndexes(tables)
-    createStaticForeignKeys(tables)
+    statics = createStaticTables(g_catalog, g_schema, tables)
+    createStaticIndexes(g_catalog, g_schema, tables)
+    createStaticForeignKeys(g_catalog, g_schema, tables)
     setStaticTable(statement, statics, g_csv, True)
     _createTables(connection, statement, tables)
     _createIndexes(statement, tables)
     _createForeignKeys(statement, tables)
-    executeQueries(ctx, statement, _getQueries())
+    views = _getViews(ctx, g_catalog, g_schema, 'Spooler', CheckOption.CASCADE)
+    createViews(connection.getViews(), views)
+    executeQueries(ctx, statement, _getProcedures(), 'create%s')
     statement.close()
     connection.getParent().DatabaseDocument.storeAsURL(odb, ())
     connection.close()
@@ -88,13 +97,12 @@ def _createIndexes(statement, tables):
 def _createForeignKeys(statement, tables):
     createForeignKeys(tables, getDataBaseForeignKeys(statement, getForeignKeys()))
 
-def _getQueries():
-    return (('createSpoolerView', None),
-            ('createInsertJob', None),
-            ('createInsertMergeJob', None),
-            ('createDeleteJobs', None),
-            ('createGetRecipient', None),
-            ('createGetMailer', None),
-            ('createGetAttachments', None),
-            ('createUpdateMailer', None))
+def _getViews(ctx, catalog, schema, view, *option):
+    format = {'Catalog': catalog, 'Schema': schema}
+    yield catalog, schema, view, getSqlQuery(ctx, 'get%sViewCommand' % view, format), *option
+
+def _getProcedures():
+    for name in ('InsertJob', 'InsertMergeJob', 'DeleteJobs', 'GetRecipient',
+                 'GetMailer', 'GetAttachments', 'UpdateMailer'):
+        yield name
 

source/eMailerOOo/service/pythonpath/emailer/dbqueries.py

@@ -40,40 +40,27 @@ def getSqlQuery(ctx, name, format=None):
 
 # DataBase creation Queries
     # Create View Queries
-    if name == 'createSpoolerView':
-        c1 = '"JobId"'
-        c2 = '"BatchId"'
-        c3 = '"State"'
-        c4 = '"Subject"'
-        c5 = '"Sender"'
-        c6 = '"Recipient"'
-        c7 = '"Document"'
-        c8 = '"DataSource"'
-        c9 = '"Query"'
-        c10 = '"Table"'
-        c11 = '"Filter"'
-        c12 = '"Submit"'
-        c13 = '"Sending"'
+    if name == 'getSpoolerViewCommand':
+        c1 = 'R."JobId"'
+        c2 = 'S."BatchId"'
+        c3 = 'R."State"'
+        c4 = 'S."Subject"'
+        c5 = 'S."Sender"'
+        c6 = 'R."Recipient"'
+        c7 = 'S."Document"'
+        c8 = 'S."DataSource"'
+        c9 = 'S."Query"'
+        c10 = 'S."Table"'
+        c11 = 'R."Filter"'
+        c12 = 'S."Created" AS "Submit"'
+        c13 = 'R."Modified" AS "Sending"'
         c = (c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13)
-        s1 = '"Recipients"."JobId"'
-        s2 = '"Senders"."BatchId"'
-        s3 = '"Recipients"."State"'
-        s4 = '"Senders"."Subject"'
-        s5 = '"Senders"."Sender"'
-        s6 = '"Recipients"."Recipient"'
-        s7 = '"Senders"."Document"'
-        s8 = '"Senders"."DataSource"'
-        s9 = '"Senders"."Query"'
-        s10 = '"Senders"."Table"'
-        s11 = '"Recipients"."Filter"'
-        s12 = '"Senders"."Created"'
-        s13 = '"Recipients"."Modified"'
-        s = (s1,s2,s3,s4,s5,s6,s7,s8,s9,s10,s11,s12,s13)
-        f1 = '"Senders"'
-        f2 = 'JOIN "Recipients" ON "Senders"."BatchId"="Recipients"."BatchId"'
+        f1 = '%(Catalog)s.%(Schema)s."Senders" AS S'
+        f2 = 'INNER JOIN %(Catalog)s.%(Schema)s."Recipients" AS R ON R."BatchId" = S."BatchId"'
         f = (f1,f2)
-        p = (','.join(c), ','.join(s), ' '.join(f))
-        query = 'CREATE VIEW "Spooler" (%s) AS SELECT %s FROM %s;' % p
+        p = (', '.join(c), ' '.join(f))
+        command = 'SELECT %s FROM %s;' % p
+        query = command % format
 
 # Select Queries
     # Merger Composer Select Queries