test(oracledb): change .truncate() to drop and create tables for re…

…set auto sequences `.truncate()` in oracle clear data rows but not clear sequences that's why this tests dosen't work with oracle. let's drop table and recreate for restart sequences
gabolera · May 11, 2024 · d985501 · d985501
1 parent 18e2f05
commit d985501
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 21 deletions.
diff --git a/test/integration2/query/insert/inserts.spec.js b/test/integration2/query/insert/inserts.spec.js
@@ -41,17 +41,17 @@ describe('Inserts', function () {
     describe(db, () => {
       let knex;
 
-      const createTables = async (knex) => {
+      const dropAndRecreateTables = async (knex) => {
         await dropTables(knex);
         await createUsers(knex);
         await createAccounts(knex, true);
         await createTestTableTwo(knex);
         await createDataType(knex);
-      }
+      };
 
       before(async () => {
         knex = logger(getKnexForDb(db));
-        await createTables(knex)
+        await dropAndRecreateTables(knex);
       });
 
       after(async () => {
@@ -60,10 +60,8 @@ describe('Inserts', function () {
       });
 
       beforeEach(async () => {
-        // .truncate() on oracle clear data rows but not sequences that's why
-        //  this tests dosen't work with oracle. let's drop table and recreate
-        if(isOracle(knex)){
-          await createTables(knex)
+        if (isOracle(knex)) {
+          await dropAndRecreateTables(knex);
         }
         await knex('accounts').truncate();
         await knex('test_table_two').truncate();
@@ -897,7 +895,7 @@ describe('Inserts', function () {
       });
 
       it('#5738 should handle insert with comments', async function () {
-        if(isOracle(knex)){
+        if (isOracle(knex)) {
           return this.skip('analyze this function to oracledb');
         }
         await knex('test_default_table')

diff --git a/test/integration2/query/select/joins.spec.js b/test/integration2/query/select/joins.spec.js
@@ -29,18 +29,23 @@ describe('Joins', function () {
     describe(db, () => {
       let knex;
 
-      before(async () => {
-        knex = logger(getKnexForDb(db));
+      const dropAndRecreateTables = async (knex) => {
         await dropTables(knex);
         await createAccounts(knex);
         await createTestTableTwo(knex);
-
         await insertTestTableTwoData(knex);
+      };
+
+      before(async () => {
+        knex = logger(getKnexForDb(db));
+        await dropAndRecreateTables(knex);
       });
 
       beforeEach(async () => {
+        if (isOracle(knex)) {
+          await dropAndRecreateTables(knex);
+        }
         await knex('accounts').truncate();
-
         await insertAccounts(knex);
       });
 

diff --git a/test/integration2/query/select/selects.spec.js b/test/integration2/query/select/selects.spec.js
@@ -45,19 +45,25 @@ describe('Selects', function () {
     describe(db, () => {
       let knex;
 
-      before(async () => {
-        knex = logger(getKnexForDb(db));
-
+      const dropAndRecreateTables = async (knex) => {
         await dropTables(knex);
         await createUsers(knex);
         await createAccounts(knex);
         await createCompositeKeyTable(knex);
         await createTestTableTwo(knex);
         await createDefaultTable(knex);
         await createDefaultTable(knex, true);
+      };
+
+      before(async () => {
+        knex = logger(getKnexForDb(db));
+        await dropAndRecreateTables(knex);
       });
 
       beforeEach(async () => {
+        if (isOracle(knex)) {
+          await dropAndRecreateTables(knex);
+        }
         await knex('accounts').truncate();
         await insertAccounts(knex);
       });

diff --git a/test/integration2/query/select/where.spec.js b/test/integration2/query/select/where.spec.js
@@ -39,19 +39,25 @@ describe('Where', function () {
     describe(db, () => {
       let knex;
 
-      before(async () => {
-        knex = logger(getKnexForDb(db));
-
+      const dropAndRecreateTables = async (knex) => {
         await dropTables(knex);
         await createUsers(knex);
         await createAccounts(knex);
         await createCompositeKeyTable(knex);
         await createTestTableTwo(knex);
         await createDefaultTable(knex);
         await createDefaultTable(knex, true);
+      };
+
+      before(async () => {
+        knex = logger(getKnexForDb(db));
+        await dropAndRecreateTables(knex);
       });
 
       beforeEach(async () => {
+        if (isOracle(knex)) {
+          await dropAndRecreateTables(knex);
+        }
         await knex('accounts').truncate();
         await insertAccounts(knex);
       });
@@ -434,6 +440,29 @@ describe('Where', function () {
 
       it('handles multi-column "where in" cases with where', async function () {
         if (!isSQLite(knex) && !isMssql(knex)) {
+          // Reinsert with oracle because dorp tables in beforeEach
+          if (isOracle(knex)) {
+            await knex('composite_key_test').insert([
+              {
+                column_a: 1,
+                column_b: 1,
+                details: 'One, One, One',
+                status: 1,
+              },
+              {
+                column_a: 1,
+                column_b: 2,
+                details: 'One, Two, Zero',
+                status: 0,
+              },
+              {
+                column_a: 2,
+                column_b: 2,
+                details: 'Two, Two, Zero',
+                status: 0,
+              },
+            ]);
+          }
           await knex('composite_key_test')
             .where('status', 1)
             .whereIn(

diff --git a/test/integration2/query/update/updates.spec.js b/test/integration2/query/update/updates.spec.js
@@ -3,7 +3,7 @@
 const { expect } = require('chai');
 
 const { TEST_TIMESTAMP } = require('../../../util/constants');
-const { isPostgreSQL } = require('../../../util/db-helpers');
+const { isPostgreSQL, isOracle } = require('../../../util/db-helpers');
 const {
   getAllDbs,
   getKnexForDb,
@@ -22,10 +22,14 @@ describe('Updates', function () {
       let knex;
       let accountId1;
 
+      const dropAndRecreateTables = async (knex) => {
+                await dropTables(knex);
+        await createAccounts(knex);
+};
+
       before(async () => {
         knex = logger(getKnexForDb(db));
-        await dropTables(knex);
-        await createAccounts(knex);
+        await dropAndRecreateTables(knex);
       });
 
       after(async () => {
@@ -34,6 +38,9 @@ describe('Updates', function () {
       });
 
       beforeEach(async () => {
+if (isOracle(knex)) {
+          await dropAndRecreateTables(knex);
+        }
         await knex('accounts').truncate();
         await insertAccounts(knex);
         const accounts = await knex('accounts').select().where({