diff --git a/plugins/dbgate-plugin-oracle/src/backend/Analyser.js b/plugins/dbgate-plugin-oracle/src/backend/Analyser.js
index e95dbb6ad..c1d14d928 100644
--- a/plugins/dbgate-plugin-oracle/src/backend/Analyser.js
+++ b/plugins/dbgate-plugin-oracle/src/backend/Analyser.js
@@ -88,17 +88,12 @@ class Analyser extends DatabaseAnalyser {
     const matviews = this.driver.dialect.materializedViews
       ? await this.analyserQuery('matviews', ['matviews'], { $owner: this.pool._schema_name })
       : null;
-    this.feedback({ analysingMessage: 'Loading materialized view columns' });
-    const matviewColumns = this.driver.dialect.materializedViews
-      ? await this.analyserQuery('matviewColumns', ['matviews'], { $owner: this.pool._schema_name })
-      : null;
     this.feedback({ analysingMessage: 'Loading routines' });
     const routines = await this.analyserQuery('routines', ['procedures', 'functions'], {
       $owner: this.pool._schema_name,
     });
     this.feedback({ analysingMessage: 'Loading indexes' });
     const indexes = await this.analyserQuery('indexes', ['tables'], { $owner: this.pool._schema_name });
-    this.feedback({ analysingMessage: 'Loading index columns' });
     this.feedback({ analysingMessage: 'Loading unique names' });
     const uniqueNames = await this.analyserQuery('uniqueNames', ['tables'], { $owner: this.pool._schema_name });
     this.feedback({ analysingMessage: 'Finalizing DB structure' });
@@ -187,9 +182,7 @@ class Analyser extends DatabaseAnalyser {
             schemaName: matview.schema_name,
             contentHash: matview.hash_code,
             createSql: `CREATE MATERIALIZED VIEW "${matview.schema_name}"."${matview.pure_name}"\nAS\n${matview.definition}`,
-            columns: matviewColumns.rows
-              .filter(col => col.pure_name == matview.pure_name && col.schema_name == matview.schema_name)
-              .map(col => getColumnInfo(col)),
+            columns: (columnsGrouped[columnGroup(view)] || []).map(col => getColumnInfo(col)),
           }))
         : undefined,
       procedures: routines.rows
diff --git a/plugins/dbgate-plugin-oracle/src/backend/sql/fk_key_column_usage.js b/plugins/dbgate-plugin-oracle/src/backend/sql/fk_key_column_usage.js
deleted file mode 100644
index 1cb290383..000000000
--- a/plugins/dbgate-plugin-oracle/src/backend/sql/fk_key_column_usage.js
+++ /dev/null
@@ -1,2 +0,0 @@
-module.exports = `
-`;
diff --git a/plugins/dbgate-plugin-oracle/src/backend/sql/fk_referential_constraints.js b/plugins/dbgate-plugin-oracle/src/backend/sql/fk_referential_constraints.js
deleted file mode 100644
index 1cb290383..000000000
--- a/plugins/dbgate-plugin-oracle/src/backend/sql/fk_referential_constraints.js
+++ /dev/null
@@ -1,2 +0,0 @@
-module.exports = `
-`;
diff --git a/plugins/dbgate-plugin-oracle/src/backend/sql/fk_table_constraints.js b/plugins/dbgate-plugin-oracle/src/backend/sql/fk_table_constraints.js
deleted file mode 100644
index 1cb290383..000000000
--- a/plugins/dbgate-plugin-oracle/src/backend/sql/fk_table_constraints.js
+++ /dev/null
@@ -1,2 +0,0 @@
-module.exports = `
-`;
diff --git a/plugins/dbgate-plugin-oracle/src/backend/sql/geographyColumns.js b/plugins/dbgate-plugin-oracle/src/backend/sql/geographyColumns.js
deleted file mode 100644
index 5b78f2390..000000000
--- a/plugins/dbgate-plugin-oracle/src/backend/sql/geographyColumns.js
+++ /dev/null
@@ -1,2 +0,0 @@
-module.exports = `
-`;
\ No newline at end of file
diff --git a/plugins/dbgate-plugin-oracle/src/backend/sql/geometryColumns.js b/plugins/dbgate-plugin-oracle/src/backend/sql/geometryColumns.js
deleted file mode 100644
index 5b78f2390..000000000
--- a/plugins/dbgate-plugin-oracle/src/backend/sql/geometryColumns.js
+++ /dev/null
@@ -1,2 +0,0 @@
-module.exports = `
-`;
\ No newline at end of file
diff --git a/plugins/dbgate-plugin-oracle/src/backend/sql/index.js b/plugins/dbgate-plugin-oracle/src/backend/sql/index.js
index 3c3eb665e..ca1b3f24f 100644
--- a/plugins/dbgate-plugin-oracle/src/backend/sql/index.js
+++ b/plugins/dbgate-plugin-oracle/src/backend/sql/index.js
@@ -1,15 +1,10 @@
 const columns = require('./columns');
-const tableModifications = require('./tableList');
 const tableList = require('./tableList');
-const viewModifications = require('./views');
-const matviewModifications = require('./matviews');
 const primaryKeys = require('./primaryKeys');
 const foreignKeys = require('./foreignKeys');
 const views = require('./views');
 const matviews = require('./matviews');
 const routines = require('./routines');
-const routineModifications = require('./routines');
-const matviewColumns = require('./matviewColumns');
 const indexes = require('./indexes'); // use mysql
 //const indexcols = require('./indexcols');
 const uniqueNames = require('./uniqueNames');
@@ -22,17 +17,12 @@ const uniqueNames = require('./uniqueNames');
 
 module.exports = {
   columns,
-  tableModifications,
   tableList,
-  viewModifications,
   primaryKeys,
   foreignKeys,
   views,
   routines,
-  routineModifications,
   matviews,
-  matviewModifications,
-  matviewColumns,
   indexes,
 //  indexcols,
   uniqueNames,
diff --git a/plugins/dbgate-plugin-oracle/src/backend/sql/indexcols.js b/plugins/dbgate-plugin-oracle/src/backend/sql/indexcols.js
deleted file mode 100644
index 1cb290383..000000000
--- a/plugins/dbgate-plugin-oracle/src/backend/sql/indexcols.js
+++ /dev/null
@@ -1,2 +0,0 @@
-module.exports = `
-`;
diff --git a/plugins/dbgate-plugin-oracle/src/backend/sql/matviewColumns.js b/plugins/dbgate-plugin-oracle/src/backend/sql/matviewColumns.js
deleted file mode 100644
index 85f603342..000000000
--- a/plugins/dbgate-plugin-oracle/src/backend/sql/matviewColumns.js
+++ /dev/null
@@ -1,9 +0,0 @@
-module.exports = `
-SELECT -- owner "schema_name"
-     table_name "pure_name"
-    , column_name "column_name"
-    , data_type "data_type"
-  FROM all_tab_columns av
-  where OWNER = '$owner' AND table_name =OBJECT_ID_CONDITION
-order by column_id
-`;
diff --git a/plugins/dbgate-plugin-oracle/src/backend/sql/matviewModifications.js b/plugins/dbgate-plugin-oracle/src/backend/sql/matviewModifications.js
deleted file mode 100644
index 1cb290383..000000000
--- a/plugins/dbgate-plugin-oracle/src/backend/sql/matviewModifications.js
+++ /dev/null
@@ -1,2 +0,0 @@
-module.exports = `
-`;
diff --git a/plugins/dbgate-plugin-oracle/src/backend/sql/primaryKeys.js b/plugins/dbgate-plugin-oracle/src/backend/sql/primaryKeys.js
index ffe38fc33..a5ac5f739 100644
--- a/plugins/dbgate-plugin-oracle/src/backend/sql/primaryKeys.js
+++ b/plugins/dbgate-plugin-oracle/src/backend/sql/primaryKeys.js
@@ -2,7 +2,7 @@ module.exports = `
 select
   -- pk.owner as "constraint_schema",
   pk.constraint_name as "constraint_name",
-  pk.owner as "schema_name",
+  -- pk.owner as "schema_name",
   pk.table_name as "pure_name",
   basecol.column_name as "column_name"
 from all_cons_columns basecol,
@@ -12,5 +12,6 @@ and basecol.owner = pk.owner
 and basecol.constraint_name = pk.constraint_name
 and basecol.table_name = pk.table_name
 and pk.constraint_name =OBJECT_ID_CONDITION
+and pk.owner = '$owner'
 order by basecol.position
 `;
diff --git a/plugins/dbgate-plugin-oracle/src/backend/sql/routineModifications.js b/plugins/dbgate-plugin-oracle/src/backend/sql/routineModifications.js
deleted file mode 100644
index 1cb290383..000000000
--- a/plugins/dbgate-plugin-oracle/src/backend/sql/routineModifications.js
+++ /dev/null
@@ -1,2 +0,0 @@
-module.exports = `
-`;
diff --git a/plugins/dbgate-plugin-oracle/src/backend/sql/tableModifications.js b/plugins/dbgate-plugin-oracle/src/backend/sql/tableModifications.js
deleted file mode 100644
index 1cb290383..000000000
--- a/plugins/dbgate-plugin-oracle/src/backend/sql/tableModifications.js
+++ /dev/null
@@ -1,2 +0,0 @@
-module.exports = `
-`;
diff --git a/plugins/dbgate-plugin-oracle/src/backend/sql/viewModifications.js b/plugins/dbgate-plugin-oracle/src/backend/sql/viewModifications.js
deleted file mode 100644
index 1cb290383..000000000
--- a/plugins/dbgate-plugin-oracle/src/backend/sql/viewModifications.js
+++ /dev/null
@@ -1,2 +0,0 @@
-module.exports = `
-`;