Merge branch 'master' into develop

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

package.json

@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "5.3.4",
+  "version": "5.3.5-beta.1",
   "name": "dbgate-all",
   "workspaces": [
     "packages/*",

plugins/dbgate-plugin-oracle/src/backend/driver.js

@@ -172,10 +172,12 @@ const driver = {
       });
 
       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(),
@@ -194,8 +196,11 @@ const driver = {
       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',
           });