@itrocks/mysql 0.0.24 → 0.0.26
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.
- package/cjs/mysql.js +7 -3
- package/esm/mysql.js +7 -3
- package/package.json +1 -1
package/cjs/mysql.js
CHANGED
|
@@ -60,7 +60,7 @@ class Mysql extends storage_1.DataSource {
|
|
|
60
60
|
const sql = this.propertiesToSearchSql(search);
|
|
61
61
|
const [values] = await this.valuesToDb(search);
|
|
62
62
|
if (exports.DEBUG)
|
|
63
|
-
console.log('SELECT COUNT(*) FROM `' + depends.storeOf(type) + '`' + sql,
|
|
63
|
+
console.log('SELECT COUNT(*) FROM `' + depends.storeOf(type) + '`' + sql, JSON.stringify(values));
|
|
64
64
|
const row = (await connection.query('SELECT COUNT(*) `count` FROM `' + depends.storeOf(type) + '`' + sql, Object.values(values)))[0];
|
|
65
65
|
return row?.count;
|
|
66
66
|
}
|
|
@@ -122,11 +122,15 @@ class Mysql extends storage_1.DataSource {
|
|
|
122
122
|
.map(([name, value]) => {
|
|
123
123
|
let sql;
|
|
124
124
|
if (value instanceof depends.QueryFunction) {
|
|
125
|
-
[
|
|
125
|
+
[value, sql] = depends.queryFunctionCall(value);
|
|
126
|
+
search[name] = value;
|
|
126
127
|
}
|
|
127
128
|
else {
|
|
128
129
|
sql = ' = ?';
|
|
129
130
|
}
|
|
131
|
+
if ((typeof value)[0] === 'o') {
|
|
132
|
+
name = Array.isArray(value) ? 'id' : (name + '_id');
|
|
133
|
+
}
|
|
130
134
|
return '`' + depends.columnOf(name) + '`' + sql;
|
|
131
135
|
})
|
|
132
136
|
.join(' AND ');
|
|
@@ -325,7 +329,7 @@ class Mysql extends storage_1.DataSource {
|
|
|
325
329
|
const sql = this.propertiesToSearchSql(search);
|
|
326
330
|
const [values] = await this.valuesToDb(search);
|
|
327
331
|
if (exports.DEBUG)
|
|
328
|
-
console.log('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '`' + sql,
|
|
332
|
+
console.log('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '`' + sql, JSON.stringify(values));
|
|
329
333
|
const limit = limitOption?.limit ? ' LIMIT ' + limitOption.limit : '';
|
|
330
334
|
const offset = limitOption?.offset ? ' OFFSET ' + limitOption.offset : '';
|
|
331
335
|
const sort = sortOption?.properties.length
|
package/esm/mysql.js
CHANGED
|
@@ -55,7 +55,7 @@ export class Mysql extends DataSource {
|
|
|
55
55
|
const sql = this.propertiesToSearchSql(search);
|
|
56
56
|
const [values] = await this.valuesToDb(search);
|
|
57
57
|
if (DEBUG)
|
|
58
|
-
console.log('SELECT COUNT(*) FROM `' + depends.storeOf(type) + '`' + sql,
|
|
58
|
+
console.log('SELECT COUNT(*) FROM `' + depends.storeOf(type) + '`' + sql, JSON.stringify(values));
|
|
59
59
|
const row = (await connection.query('SELECT COUNT(*) `count` FROM `' + depends.storeOf(type) + '`' + sql, Object.values(values)))[0];
|
|
60
60
|
return row?.count;
|
|
61
61
|
}
|
|
@@ -117,11 +117,15 @@ export class Mysql extends DataSource {
|
|
|
117
117
|
.map(([name, value]) => {
|
|
118
118
|
let sql;
|
|
119
119
|
if (value instanceof depends.QueryFunction) {
|
|
120
|
-
[
|
|
120
|
+
[value, sql] = depends.queryFunctionCall(value);
|
|
121
|
+
search[name] = value;
|
|
121
122
|
}
|
|
122
123
|
else {
|
|
123
124
|
sql = ' = ?';
|
|
124
125
|
}
|
|
126
|
+
if ((typeof value)[0] === 'o') {
|
|
127
|
+
name = Array.isArray(value) ? 'id' : (name + '_id');
|
|
128
|
+
}
|
|
125
129
|
return '`' + depends.columnOf(name) + '`' + sql;
|
|
126
130
|
})
|
|
127
131
|
.join(' AND ');
|
|
@@ -320,7 +324,7 @@ export class Mysql extends DataSource {
|
|
|
320
324
|
const sql = this.propertiesToSearchSql(search);
|
|
321
325
|
const [values] = await this.valuesToDb(search);
|
|
322
326
|
if (DEBUG)
|
|
323
|
-
console.log('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '`' + sql,
|
|
327
|
+
console.log('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '`' + sql, JSON.stringify(values));
|
|
324
328
|
const limit = limitOption?.limit ? ' LIMIT ' + limitOption.limit : '';
|
|
325
329
|
const offset = limitOption?.offset ? ' OFFSET ' + limitOption.offset : '';
|
|
326
330
|
const sort = sortOption?.properties.length
|
package/package.json
CHANGED