From aad4df419c694a2136aa0045ac55813d8d3c2e99 Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Mon, 5 Aug 2024 09:41:36 +0200
Subject: [PATCH 1/3] changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aecd5a532..daf318837 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@ Builds:
  - linux - application for linux
  - win - application for Windows
 
+### 5.3.4
+- FIXED: On blank system does not start (window does not appear) #862
+- FIXED: Missing Execute, Export bar #861
+
 ### 5.3.3
 - FIXED: The application Window is not visible when openning after changing monitor configuration. #856
 - FIXED: Multi column filter is broken for Postgresql #855

From 33552e30b74dea1506598798cc14b207664b391d Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Tue, 6 Aug 2024 08:47:10 +0200
Subject: [PATCH 2/3] oracle - reporting error line numbers

---
 plugins/dbgate-plugin-oracle/src/backend/drivers.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/dbgate-plugin-oracle/src/backend/drivers.js b/plugins/dbgate-plugin-oracle/src/backend/drivers.js
index 31a56657f..8ff5cb243 100644
--- a/plugins/dbgate-plugin-oracle/src/backend/drivers.js
+++ b/plugins/dbgate-plugin-oracle/src/backend/drivers.js
@@ -154,10 +154,12 @@ const drivers = driverBases.map(driverBase => ({
       });
 
       query.on('error', error => {
-        console.log('ERROR', error);
-        const { message, lineNumber, procName } = error;
+        const { message, offset, procName } = error;
+        // get line number from string s of character at offset
+        const lineNumber = (sql.substring(0, offset).match(/\n/g) || []).length;
         options.info({
           message,
+          offset,
           line: lineNumber,
           procedure: procName,
           time: new Date(),
@@ -176,8 +178,11 @@ const drivers = driverBases.map(driverBase => ({
       client.execute(sql, (err, res) => {
         if (err) {
           console.log('Error query', err, sql);
+          const lineNumber = (sql.substring(0, err.offset).match(/\n/g) || []).length;
           options.info({
             message: err.message,
+            line: lineNumber,
+            offset: err.offset,
             time: new Date(),
             severity: 'error',
           });

From 623456b0a77b1fd7e963214f94594a93e5a36720 Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Tue, 6 Aug 2024 08:55:16 +0200
Subject: [PATCH 3/3] v5.3.5-beta.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 874bdfccf..f1f4321d5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "5.3.4",
+  "version": "5.3.5-beta.1",
   "name": "dbgate-all",
   "workspaces": [
     "packages/*",