From 89f686a1186c9709f195f2889fc49221c42d071d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Dec 2019 21:15:15 +0000
Subject: [PATCH 1/2] Bump excon from 0.62.0 to 0.71.0

Bumps [excon](https://github.com/excon/excon) from 0.62.0 to 0.71.0.
- [Release notes](https://github.com/excon/excon/releases)
- [Changelog](https://github.com/excon/excon/blob/master/changelog.txt)
- [Commits](https://github.com/excon/excon/compare/v0.62.0...v0.71.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 51c93ed..8795ace 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,7 +6,7 @@ GEM
     docker-api (1.34.2)
       excon (>= 0.47.0)
       multi_json
-    excon (0.62.0)
+    excon (0.71.0)
     method_source (0.9.0)
     multi_json (1.13.1)
     net-scp (1.2.1)

From 82e539d29407c2304e61aad359ed322a79fe4ec9 Mon Sep 17 00:00:00 2001
From: JamesCullum <5477111+JamesCullum@users.noreply.github.com>
Date: Wed, 29 Jan 2020 09:44:41 +0100
Subject: [PATCH 2/2] Add documentation and default for
 https://github.com/passbolt/passbolt_api/pull/342

---
 README.md        | 1 +
 env/passbolt.env | 1 +
 2 files changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 94be893..548f110 100644
--- a/README.md
+++ b/README.md
@@ -86,6 +86,7 @@ Passbolt docker image provides several environment variables to configure differ
 | DATASOURCES_DEFAULT_SSL_KEY         | Database SSL Key                 | '' |
 | DATASOURCES_DEFAULT_SSL_CERT        | Database SSL Cert                | '' |
 | DATASOURCES_DEFAULT_SSL_CA          | Database SSL CA                  | '' |
+| DATASOURCES_QUOTE_IDENTIFIER        | Enable database quoting ([needed for for MySQL 8+](https://github.com/passbolt/passbolt_api/issues/325)) | false |
 | EMAIL_TRANSPORT_DEFAULT_CLASS_NAME  | Email classname                  | Smtp |
 | EMAIL_DEFAULT_FROM                  | From email address               | you@localhost |
 | EMAIL_DEFAULT_TRANSPORT             | Sets transport method            | default |
diff --git a/env/passbolt.env b/env/passbolt.env
index 1f0ec57..ce7f723 100644
--- a/env/passbolt.env
+++ b/env/passbolt.env
@@ -7,6 +7,7 @@ DATASOURCES_DEFAULT_USERNAME=passbolt
 DATASOURCES_DEFAULT_PASSWORD=P4ssb0lt
 DATASOURCES_DEFAULT_DATABASE=passbolt
 DATASOURCES_DEFAULT_PORT=3306
+DATASOURCES_QUOTE_IDENTIFIER=true
 
 # Registration
 PASSBOLT_REGISTRATION_PUBLIC=true