The_Great_Archive/xca
1
0
Fork 0
mirror of https://github.com/chris2511/xca.git synced 2026-09-12 19:51:05 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Close #306 #537 Allow Database-driver options in config file

Browse Source 
XCA tries to read Database-driver specific options from
configurartion files in the getUserSettingsDir()
named after the driver and the host.
This commit is contained in:
Christian Hohnstaedt 2024-10-02 22:22:58 +02:00
parent b2869e0152
commit fee6235724
3 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
doc/rst/database.rst
View File

@ -45,20 +45,44 @@ Apple macos
- **ODBC**: It requires the /usr/local/opt/libiodbc/lib/libiodbc.2.dylib.
When installing unixodbc via brew the library must be symlinked from
/opt/homebrew/Cellar/libiodbc/3.52.16/lib/libiodbc.2.dylib
- **MariaDB**: Probably via ODBC ?
- **MariaDB**: Since XCA-2.8.0 the MariaDB plugin is included in the
xca.app bundle. No additional installation is required.
Windows
.......
- **PostgreSQL**: https://www.enterprisedb.com/downloads/postgres-postgresql-downloads
(Commandline tools are sufficient). Add the bin directory of the Postgres
(Commandline tools are sufficient). Add the *bin* directory of the Postgres
installation directory to your PATH (C:\\Program Files\\PostgreSQL\\16)
- **ODBC**: Use the *ODBC Datasources 64bit* app to configure the SQL Server
If the data source is configured completel, only the matching DSN
- **ODBC**: Use the *ODBC Datasources 64bit* app to configure the SQL Server.
If the data source is configured completel, only the matching DSN is required
in the XCA connection settings.
- **MariaDB (MySQL)**: Install the Plugin from here:
https://github.com/thecodemonkey86/qt_mysql_driver. Select the MinGW variant
and install it as documented.
Driver specific configurations
..............................
Additional options for the database connection can be set in configuration files.
They must be put in the XCA configuration directory, which is displayed in the about dialog.
If there is already a file called *dbhistory* then you know you are in the right place.
The options-file must be named after the database driver, e.g. *QPSQL*, *QMYSQL* or *QODBC*
optionally followed by a dash and the database-hostname (exactly as used in the connection settings
including an optional port number) and a *.options* extension.
Examples:
- QMYSQL-192.168.12.13.options
- QPSQL.options
Also the environment variable XCA_<driver-name>_OPTIONS may be used to set the options.
The file must contain the options as ; separated key=value pairs. The recognized options depend
on the database driver. See:
https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-PARAMKEYWORDS for PostgreSQL and
https://doc.qt.io/qt-6/sql-driver.html#connection-options for MySQL and
https://doc.qt.io/qt-6/sql-driver.html#odbc-unicode-support for ODBC.
.. _extracting-items:

16
lib/database_model.cpp
View File

@ -409,6 +409,22 @@ void database_model::openRemoteDatabase(const QString &connName,
db.setUserName(params["user"]);
db.setPassword(pass);
const QStringList sql_opt_files = {
QString("%1-%2.options").arg(db.driverName()).arg(params["host"]),
QString("%1.options").arg(db.driverName())
};
for (const QString &file : sql_opt_files) {
QString path = getUserSettingsDir() + "/" + file;
qDebug() << "TRYING" << path;
XFile f(getUserSettingsDir() + "/" + file);
if (f.exists() && f.open_read()) {
qDebug() << "READING" << file;
QString opts = f.readAll();
db.setConnectOptions(opts);
break;
}
f.close();
}
QString envvar(QString("XCA_%1_OPTIONS").arg(db.driverName()));
const char *opts = getenv(envvar.toLatin1());
if (opts)

2
release/build-mac.sh
View File

@ -133,7 +133,7 @@ do_openssl
# aqt install-src mac 6.6.3 --archives qtbase
# qtbase/src/plugins/sqldrivers/mysql/CMakeLists.txt:
# -qt_internal_force_macos_intel_arch(QMYSQLDriverPlugin)
# do_qsqlmysql
do_qsqlmysql
cmake -B "$BUILDDIR" "$XCA_DIR" \