diff --git a/docs/stores/wordpress.md b/docs/stores/wordpress.md index 14e9c94..545824a 100644 --- a/docs/stores/wordpress.md +++ b/docs/stores/wordpress.md @@ -55,3 +55,11 @@ With possible values: - `mariadb` - `postgresql` - `sqlite` + +--- + +To configure the tables prefix for default queries, in case a custom value was set during Wordpress install: +```yaml +wordpress.sql.tablePrefix: +``` +By default, the value is set to `wp_`. diff --git a/src/main/java/io/kamax/mxisd/config/wordpress/WordpressConfig.java b/src/main/java/io/kamax/mxisd/config/wordpress/WordpressConfig.java index d4ce42a..9ce3789 100644 --- a/src/main/java/io/kamax/mxisd/config/wordpress/WordpressConfig.java +++ b/src/main/java/io/kamax/mxisd/config/wordpress/WordpressConfig.java @@ -105,6 +105,7 @@ public class WordpressConfig { private String type; private String connection; + private String tablePrefix; private Query query; public String getType() { @@ -123,6 +124,14 @@ public class WordpressConfig { this.connection = connection; } + public String getTablePrefix() { + return tablePrefix; + } + + public void setTablePrefix(String tablePrefix) { + this.tablePrefix = tablePrefix; + } + public Query getQuery() { return query; } diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 90d70ee..8bee8d6 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -166,12 +166,13 @@ wordpress: enabled: false sql: type: 'mysql' + tablePrefix: 'wp_' query: threepid: - email: 'SELECT user_login as uid FROM wp_users WHERE user_email = ?' + email: 'SELECT user_login as uid FROM ${wordpress.sql.tablePrefix}users WHERE user_email = ?' directory: - name: "SELECT DISTINCT user_login, display_name FROM wp_users u LEFT JOIN wp_usermeta m ON m.user_id = u.id WHERE u.display_name LIKE ? OR (m.meta_key = 'nickname' AND m.meta_value = ?) OR (m.meta_key = 'first_name' AND m.meta_value = ?) OR (m.meta_key = 'last_name' AND m.meta_value = ?);" - threepid: 'SELECT DISTINCT user_login, display_name FROM wp_users WHERE user_email LIKE ?' + name: "SELECT DISTINCT user_login, display_name FROM ${wordpress.sql.tablePrefix}users u LEFT JOIN ${wordpress.sql.tablePrefix}usermeta m ON m.user_id = u.id WHERE u.display_name LIKE ? OR (m.meta_key = 'nickname' AND m.meta_value = ?) OR (m.meta_key = 'first_name' AND m.meta_value = ?) OR (m.meta_key = 'last_name' AND m.meta_value = ?);" + threepid: 'SELECT DISTINCT user_login, display_name FROM ${wordpress.sql.tablePrefix}users WHERE user_email LIKE ?' forward: servers: []