From a0cefbc1ca34572c987a852be97165561396e188 Mon Sep 17 00:00:00 2001
From: Rinie Kervel <Rinie.Kervel@Centric.eu>
Date: Sun, 30 Oct 2022 08:32:53 +0100
Subject: [PATCH] merge dbgate master and test drivers

---
 .../src/backend/drivers.js                    | 25 +++++++++----------
 .../src/frontend/drivers.js                   |  1 +
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/plugins/dbgate-plugin-oracle/src/backend/drivers.js b/plugins/dbgate-plugin-oracle/src/backend/drivers.js
index 413a7c19..1aeedb22 100644
--- a/plugins/dbgate-plugin-oracle/src/backend/drivers.js
+++ b/plugins/dbgate-plugin-oracle/src/backend/drivers.js
@@ -108,7 +108,7 @@ const drivers = driverBases.map(driverBase => ({
       };
     }
 try {
-      //console.log('sql', sql);
+      console.log('sql', sql);
     const res = await client.execute(sql);
       //console.log('res', res);
     const columns = extractOracleColumns(res.metaData);
@@ -239,7 +239,7 @@ finally {
       rowMode: 'array',
     });
 */
-    //console.log('readQuery', sql, structure);
+    console.log('readQuery', sql, structure);
     const query = await client.queryStream(sql);
 
     let wasHeader = false;
@@ -250,29 +250,28 @@ finally {
       highWaterMark: 100,
     });
 
-    query.on('data', row => {
+    query.on('metadata', row => {
+      console.log('readQuery metadata', row);
       if (!wasHeader) {
-        columns = extractOracleColumns(query._result);
+        columns = extractOracleColumns(row);
+        if (columns && columns.length > 0) {
         pass.write({
           __isStreamHeader: true,
           ...(structure || { columns }),
         });
+        }
         wasHeader = true;
       }
 
       pass.write(zipDataRow(row, columns));
     });
 
-    query.on('end', () => {
-      if (!wasHeader) {
-        columns = extractOracleColumns(query._result);
-        pass.write({
-          __isStreamHeader: true,
-          ...(structure || { columns }),
-        });
-        wasHeader = true;
-      }
+    query.on('data', row => {
+      console.log('readQuery data', row);
+      pass.write(zipDataRow(row, columns));
+    });
 
+    query.on('end', () => {
       pass.end();
     });
 
diff --git a/plugins/dbgate-plugin-oracle/src/frontend/drivers.js b/plugins/dbgate-plugin-oracle/src/frontend/drivers.js
index d0616da9..fd60b2aa 100644
--- a/plugins/dbgate-plugin-oracle/src/frontend/drivers.js
+++ b/plugins/dbgate-plugin-oracle/src/frontend/drivers.js
@@ -8,6 +8,7 @@ const spatialTypes = ['GEOGRAPHY'];
 const dialect = {
   rangeSelect: false,
   limitSelect: false,
+  offsetFetchRangeSyntax: true,
   ilike: true,
   // stringEscapeChar: '\\',
   stringEscapeChar: "'",