@reldens/storage 0.37.0 → 0.38.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -11,8 +11,7 @@ class MySQLTablesProvider
|
|
|
11
11
|
|
|
12
12
|
static async fetchTables(server)
|
|
13
13
|
{
|
|
14
|
-
let tablesQuery =
|
|
15
|
-
'SELECT ' +
|
|
14
|
+
let tablesQuery = 'SELECT ' +
|
|
16
15
|
' TABLE_NAME, ' +
|
|
17
16
|
' COLUMN_NAME, ' +
|
|
18
17
|
' DATA_TYPE, ' +
|
|
@@ -27,7 +26,7 @@ class MySQLTablesProvider
|
|
|
27
26
|
'WHERE ' +
|
|
28
27
|
' TABLE_SCHEMA = \'' + server.config.database + '\' ' +
|
|
29
28
|
'ORDER BY ' +
|
|
30
|
-
' TABLE_NAME, ORDINAL_POSITION';
|
|
29
|
+
' TABLE_NAME, ORDINAL_POSITION;';
|
|
31
30
|
try {
|
|
32
31
|
let result = await server.rawQuery(tablesQuery);
|
|
33
32
|
if(!sc.isArray(result) || 0 === result.length){
|
|
@@ -52,8 +51,7 @@ class MySQLTablesProvider
|
|
|
52
51
|
default: row.COLUMN_DEFAULT
|
|
53
52
|
};
|
|
54
53
|
}
|
|
55
|
-
let foreignKeysQuery =
|
|
56
|
-
'SELECT ' +
|
|
54
|
+
let foreignKeysQuery = 'SELECT ' +
|
|
57
55
|
' TABLE_NAME, ' +
|
|
58
56
|
' COLUMN_NAME, ' +
|
|
59
57
|
' REFERENCED_TABLE_NAME, ' +
|
|
@@ -62,15 +60,12 @@ class MySQLTablesProvider
|
|
|
62
60
|
' information_schema.KEY_COLUMN_USAGE ' +
|
|
63
61
|
'WHERE ' +
|
|
64
62
|
' TABLE_SCHEMA = \'' + server.config.database + '\' ' +
|
|
65
|
-
' AND REFERENCED_TABLE_NAME IS NOT NULL';
|
|
66
|
-
|
|
63
|
+
' AND REFERENCED_TABLE_NAME IS NOT NULL;';
|
|
64
|
+
|
|
67
65
|
let foreignKeysResult = await server.rawQuery(foreignKeysQuery);
|
|
68
66
|
if(sc.isArray(foreignKeysResult) && 0 < foreignKeysResult.length){
|
|
69
67
|
for(let row of foreignKeysResult){
|
|
70
|
-
if(
|
|
71
|
-
tables[row.TABLE_NAME] &&
|
|
72
|
-
tables[row.TABLE_NAME].columns[row.COLUMN_NAME]
|
|
73
|
-
){
|
|
68
|
+
if(tables[row.TABLE_NAME] && tables[row.TABLE_NAME].columns[row.COLUMN_NAME]){
|
|
74
69
|
tables[row.TABLE_NAME].columns[row.COLUMN_NAME].referencedTable = row.REFERENCED_TABLE_NAME;
|
|
75
70
|
tables[row.TABLE_NAME].columns[row.COLUMN_NAME].referencedColumn = row.REFERENCED_COLUMN_NAME;
|
|
76
71
|
}
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
const { BaseDataServer } = require('../base-data-server');
|
|
8
8
|
const { PrismaDriver } = require('./prisma-driver');
|
|
9
9
|
const { MySQLTablesProvider } = require('../mysql-tables-provider');
|
|
10
|
-
const {
|
|
10
|
+
const { Logger } = require('@reldens/utils');
|
|
11
11
|
|
|
12
12
|
class PrismaDataServer extends BaseDataServer
|
|
13
13
|
{
|
|
@@ -85,8 +85,7 @@ class PrismaDataServer extends BaseDataServer
|
|
|
85
85
|
continue;
|
|
86
86
|
}
|
|
87
87
|
try {
|
|
88
|
-
|
|
89
|
-
results.push(queryResult);
|
|
88
|
+
results.push(await this.executeStatement(cleanStatement));
|
|
90
89
|
} catch(stmtError) {
|
|
91
90
|
Logger.error('Statement "'+cleanStatement+'" execution failed: '+stmtError.message);
|
|
92
91
|
return false;
|
|
@@ -102,6 +101,14 @@ class PrismaDataServer extends BaseDataServer
|
|
|
102
101
|
}
|
|
103
102
|
}
|
|
104
103
|
|
|
104
|
+
async executeStatement(statement)
|
|
105
|
+
{
|
|
106
|
+
if(statement.trim().toUpperCase().startsWith('SELECT')){
|
|
107
|
+
return await this.prisma.$queryRawUnsafe(statement);
|
|
108
|
+
}
|
|
109
|
+
return await this.prisma.$executeRawUnsafe(statement);
|
|
110
|
+
}
|
|
111
|
+
|
|
105
112
|
splitSqlStatements(sqlContent)
|
|
106
113
|
{
|
|
107
114
|
let statements = [];
|