@spinajs/orm-mysql 2.0.17 → 2.0.19
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/lib/compilers.js +8 -6
- package/lib/compilers.js.map +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.js +5 -3
- package/lib/index.js.map +1 -1
- package/package.json +7 -8
- package/lib/orm-mysql.js +0 -7
package/lib/compilers.js
CHANGED
|
@@ -20,13 +20,15 @@ let MySqlTableExistsCompiler = class MySqlTableExistsCompiler {
|
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
22
|
compile() {
|
|
23
|
+
if (this.builder.Database) {
|
|
24
|
+
return {
|
|
25
|
+
bindings: [this.builder.Database, this.builder.Table],
|
|
26
|
+
expression: `SELECT * FROM information_schema.tables WHERE table_schema = ? AND table_name = ? LIMIT 1;`,
|
|
27
|
+
};
|
|
28
|
+
}
|
|
23
29
|
return {
|
|
24
|
-
bindings: [this.builder.
|
|
25
|
-
expression: `SELECT *
|
|
26
|
-
FROM information_schema.tables
|
|
27
|
-
WHERE table_schema = ?
|
|
28
|
-
AND table_name = ?
|
|
29
|
-
LIMIT 1;`,
|
|
30
|
+
bindings: [this.builder.Table],
|
|
31
|
+
expression: `SELECT * FROM information_schema.tables WHERE table_name = ? LIMIT 1;`,
|
|
30
32
|
};
|
|
31
33
|
}
|
|
32
34
|
};
|
package/lib/compilers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compilers.js","sourceRoot":"","sources":["../src/compilers.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAA0C;AAC1C,sCAA6F;AAG7F,IAAa,wBAAwB,GAArC,MAAa,wBAAwB;IACnC,YAAsB,OAAgC;QAAhC,YAAO,GAAP,OAAO,CAAyB;QACpD,IAAI,OAAO,KAAK,IAAI,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;SAC9D;IACH,CAAC;IAEM,OAAO;QACZ,OAAO;
|
|
1
|
+
{"version":3,"file":"compilers.js","sourceRoot":"","sources":["../src/compilers.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAA0C;AAC1C,sCAA6F;AAG7F,IAAa,wBAAwB,GAArC,MAAa,wBAAwB;IACnC,YAAsB,OAAgC;QAAhC,YAAO,GAAP,OAAO,CAAyB;QACpD,IAAI,OAAO,KAAK,IAAI,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;SAC9D;IACH,CAAC;IAEM,OAAO;QACZ,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;YACzB,OAAO;gBACL,QAAQ,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;gBACrD,UAAU,EAAE,4FAA4F;aACzG,CAAC;SACH;QAED,OAAO;YACL,QAAQ,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;YAC9B,UAAU,EAAE,uEAAuE;SACpF,CAAC;IACJ,CAAC;CACF,CAAA;AApBY,wBAAwB;IADpC,IAAA,gBAAW,GAAE;qCAEmB,6BAAuB;GAD3C,wBAAwB,CAoBpC;AApBY,4DAAwB"}
|
package/lib/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { QueryContext, OrmDriver, IColumnDescriptor, QueryBuilder, TransactionCallback } from '@spinajs/orm';
|
|
2
2
|
import { SqlDriver } from '@spinajs/orm-sql';
|
|
3
|
-
import * as mysql from '
|
|
3
|
+
import * as mysql from 'mysql2';
|
|
4
4
|
export declare class MySqlOrmDriver extends SqlDriver {
|
|
5
5
|
protected Pool: mysql.Pool;
|
|
6
6
|
protected _executionId: number;
|
package/lib/index.js
CHANGED
|
@@ -35,7 +35,7 @@ const di_1 = require("@spinajs/di");
|
|
|
35
35
|
const log_1 = require("@spinajs/log");
|
|
36
36
|
const orm_1 = require("@spinajs/orm");
|
|
37
37
|
const orm_sql_1 = require("@spinajs/orm-sql");
|
|
38
|
-
const mysql = __importStar(require("
|
|
38
|
+
const mysql = __importStar(require("mysql2"));
|
|
39
39
|
const compilers_1 = require("./compilers");
|
|
40
40
|
let MySqlOrmDriver = class MySqlOrmDriver extends orm_sql_1.SqlDriver {
|
|
41
41
|
constructor() {
|
|
@@ -55,11 +55,11 @@ let MySqlOrmDriver = class MySqlOrmDriver extends orm_sql_1.SqlDriver {
|
|
|
55
55
|
case orm_1.QueryContext.Update:
|
|
56
56
|
case orm_1.QueryContext.Delete:
|
|
57
57
|
resolve({
|
|
58
|
-
RowsAffected: results.
|
|
58
|
+
RowsAffected: results.affectedRows,
|
|
59
59
|
});
|
|
60
60
|
break;
|
|
61
61
|
case orm_1.QueryContext.Insert:
|
|
62
|
-
resolve({ LastInsertId: results.insertId, RowsAffected: results.
|
|
62
|
+
resolve({ LastInsertId: results.insertId, RowsAffected: results.affectedRows });
|
|
63
63
|
break;
|
|
64
64
|
default:
|
|
65
65
|
resolve(results);
|
|
@@ -114,6 +114,8 @@ let MySqlOrmDriver = class MySqlOrmDriver extends orm_sql_1.SqlDriver {
|
|
|
114
114
|
this.Pool = mysql.createPool({
|
|
115
115
|
host: this.Options.Host,
|
|
116
116
|
user: this.Options.User,
|
|
117
|
+
password: this.Options.Password,
|
|
118
|
+
port: this.Options.Port,
|
|
117
119
|
database: this.Options.Database,
|
|
118
120
|
waitForConnections: true,
|
|
119
121
|
connectionLimit: this.Options.PoolLimit,
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAmD;AACnD,oCAAyC;AACzC,sCAAwC;AACxC,sCAAkI;AAClI,8CAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@spinajs/orm-mysql",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.19",
|
|
4
4
|
"description": "orm mysql integration",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"private": false,
|
|
@@ -40,16 +40,15 @@
|
|
|
40
40
|
},
|
|
41
41
|
"homepage": "https://github.com/spinajs/main#readme",
|
|
42
42
|
"devDependencies": {
|
|
43
|
-
"@types/mysql": "^2.15.21",
|
|
44
43
|
"chai": "^4.3.6",
|
|
45
44
|
"chai-as-promised": "^7.1.1"
|
|
46
45
|
},
|
|
47
46
|
"dependencies": {
|
|
48
|
-
"@spinajs/configuration": "^2.0.
|
|
49
|
-
"@spinajs/di": "^2.0.
|
|
50
|
-
"@spinajs/orm": "^2.0.
|
|
51
|
-
"@spinajs/orm-sql": "^2.0.
|
|
52
|
-
"
|
|
47
|
+
"@spinajs/configuration": "^2.0.19",
|
|
48
|
+
"@spinajs/di": "^2.0.19",
|
|
49
|
+
"@spinajs/orm": "^2.0.19",
|
|
50
|
+
"@spinajs/orm-sql": "^2.0.19",
|
|
51
|
+
"mysql2": "^2.3.3"
|
|
53
52
|
},
|
|
54
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "51e801176ecec955cbf1eb2d91e9f4740cb2b471"
|
|
55
54
|
}
|