tspace-mysql 1.6.1 → 1.6.3
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/README.md +130 -103
- package/build/lib/connection/index.d.ts +1 -0
- package/build/lib/connection/index.js +43 -12
- package/build/lib/connection/index.js.map +1 -1
- package/build/lib/connection/options.js +4 -4
- package/build/lib/connection/options.js.map +1 -1
- package/build/lib/core/Builder.js +2 -2
- package/build/lib/core/Builder.js.map +1 -1
- package/build/lib/core/Handlers/Relation.d.ts +4 -3
- package/build/lib/core/Handlers/Relation.js +88 -43
- package/build/lib/core/Handlers/Relation.js.map +1 -1
- package/build/lib/core/Model.d.ts +130 -108
- package/build/lib/core/Model.js +56 -23
- package/build/lib/core/Model.js.map +1 -1
- package/build/lib/types.d.ts +6 -0
- package/build/tests/01-Pool.test.js +1 -2
- package/build/tests/01-Pool.test.js.map +1 -1
- package/build/tests/02-DB.test.js +33 -34
- package/build/tests/02-DB.test.js.map +1 -1
- package/build/tests/03-Model.test.js +209 -23
- package/build/tests/03-Model.test.js.map +1 -1
- package/build/tests/mock-data-spec.d.ts +44 -0
- package/build/tests/mock-data-spec.js +53 -0
- package/build/tests/mock-data-spec.js.map +1 -0
- package/build/tests/schema-spec.d.ts +192 -0
- package/build/tests/schema-spec.js +107 -0
- package/build/tests/schema-spec.js.map +1 -0
- package/package.json +3 -2
package/README.md
CHANGED
|
@@ -94,6 +94,7 @@ npm install tspace-mysql -g
|
|
|
94
94
|
- [Repository Update Statements](#repository-update-statements)
|
|
95
95
|
- [Repository Delete Statements](#repository-delete-statements)
|
|
96
96
|
- [Repository Transactions](#repository-transactions)
|
|
97
|
+
- [Repository Relations](#repository-relations)
|
|
97
98
|
- [Blueprint](#blueprint)
|
|
98
99
|
- [Cli](#cli)
|
|
99
100
|
- [Make Model](#make-model)
|
|
@@ -1171,13 +1172,13 @@ class User extends Model {
|
|
|
1171
1172
|
* this.useHooks([(r) => console.log(r)])
|
|
1172
1173
|
* this.useObserver(Observe)
|
|
1173
1174
|
* this.useSchema ({
|
|
1174
|
-
* id :
|
|
1175
|
-
* uuid :
|
|
1176
|
-
* name :
|
|
1177
|
-
* email :
|
|
1178
|
-
* created_at :
|
|
1179
|
-
* updated_at :
|
|
1180
|
-
* deleted_at :
|
|
1175
|
+
* id : Blueprint.int().notNull().primary().autoIncrement(),
|
|
1176
|
+
* uuid : Blueprint.varchar(50).null(),
|
|
1177
|
+
* name : Blueprint.varchar(191).notNull(),
|
|
1178
|
+
* email : Blueprint.varchar(191).notNull(),
|
|
1179
|
+
* created_at : Blueprint.timestamp().null(),
|
|
1180
|
+
* updated_at : Blueprint.timestamp().null(),
|
|
1181
|
+
* deleted_at : Blueprint.timestamp().null()
|
|
1181
1182
|
* }) // auto-generated table when table is not exists and auto-create column when column not exists
|
|
1182
1183
|
*
|
|
1183
1184
|
* // validate input when create or update reference to the schema in 'this.useSchema'
|
|
@@ -1659,6 +1660,7 @@ class Post extends Model {
|
|
|
1659
1660
|
super()
|
|
1660
1661
|
this.hasMany({ name : 'comments' , model : Comment })
|
|
1661
1662
|
this.belongsTo({ name : 'user' , model : User })
|
|
1663
|
+
this.belongsToMany({ name : 'users' , model : User , modelPivot : PostUser })
|
|
1662
1664
|
}
|
|
1663
1665
|
}
|
|
1664
1666
|
+--------------------------------------------------------------------------+
|
|
@@ -1669,12 +1671,15 @@ class Comment extends Model {
|
|
|
1669
1671
|
this.belongsTo({ name : 'post' , model : Post })
|
|
1670
1672
|
}
|
|
1671
1673
|
}
|
|
1674
|
+
|
|
1675
|
+
class PostUser extends Model {}
|
|
1672
1676
|
+--------------------------------------------------------------------------+
|
|
1673
1677
|
// Deeply nested relations
|
|
1674
1678
|
await new User()
|
|
1675
1679
|
.relations('posts')
|
|
1676
1680
|
.relationQuery('posts', (query : Post) => {
|
|
1677
|
-
return query
|
|
1681
|
+
return query
|
|
1682
|
+
.relations('comments','user','users')
|
|
1678
1683
|
.relationQuery('comments', (query : Comment) => {
|
|
1679
1684
|
return query.relations('user','post')
|
|
1680
1685
|
})
|
|
@@ -1684,6 +1689,12 @@ await new User()
|
|
|
1684
1689
|
// relation n, n, ...n
|
|
1685
1690
|
})
|
|
1686
1691
|
})
|
|
1692
|
+
.relationQuery('users', (query : User) => {
|
|
1693
|
+
return query
|
|
1694
|
+
})
|
|
1695
|
+
.relationQuery('users', (query : PostUser) => {
|
|
1696
|
+
return query
|
|
1697
|
+
}, { pivot : true })
|
|
1687
1698
|
})
|
|
1688
1699
|
.findMany()
|
|
1689
1700
|
|
|
@@ -2037,13 +2048,13 @@ class UserObserve {
|
|
|
2037
2048
|
@Table('users')
|
|
2038
2049
|
class User extends Model {
|
|
2039
2050
|
|
|
2040
|
-
@Column(() =>
|
|
2051
|
+
@Column(() => Blueprint.int().notNull().primary().autoIncrement())
|
|
2041
2052
|
public id!: number
|
|
2042
2053
|
|
|
2043
|
-
@Column(() =>
|
|
2054
|
+
@Column(() => Blueprint.varchar(50).null())
|
|
2044
2055
|
public uuid!: string
|
|
2045
2056
|
|
|
2046
|
-
@Column(() =>
|
|
2057
|
+
@Column(() => Blueprint.varchar(50).null())
|
|
2047
2058
|
@Validate({
|
|
2048
2059
|
type : String,
|
|
2049
2060
|
require : true,
|
|
@@ -2054,22 +2065,22 @@ class User extends Model {
|
|
|
2054
2065
|
})
|
|
2055
2066
|
public email!: string
|
|
2056
2067
|
|
|
2057
|
-
@Column(() =>
|
|
2068
|
+
@Column(() => Blueprint.varchar(50).null())
|
|
2058
2069
|
public name !: string
|
|
2059
2070
|
|
|
2060
|
-
@Column(() =>
|
|
2071
|
+
@Column(() => Blueprint.varchar(50).null())
|
|
2061
2072
|
public username !: string
|
|
2062
2073
|
|
|
2063
|
-
@Column(() =>
|
|
2074
|
+
@Column(() => Blueprint.varchar(50).null())
|
|
2064
2075
|
public password !: string
|
|
2065
2076
|
|
|
2066
|
-
@Column(() =>
|
|
2077
|
+
@Column(() => Blueprint.timestamp().null())
|
|
2067
2078
|
public createdAt!: Date
|
|
2068
2079
|
|
|
2069
|
-
@Column(() =>
|
|
2080
|
+
@Column(() => Blueprint.timestamp().null())
|
|
2070
2081
|
public updatedAt!: Date
|
|
2071
2082
|
|
|
2072
|
-
@Column(() =>
|
|
2083
|
+
@Column(() => Blueprint.timestamp().null())
|
|
2073
2084
|
public deletedAt!: Date
|
|
2074
2085
|
|
|
2075
2086
|
}
|
|
@@ -2090,13 +2101,13 @@ using the following:
|
|
|
2090
2101
|
import { Model, Blueprint , TSchema } from "tspace-mysql";
|
|
2091
2102
|
|
|
2092
2103
|
const schema = {
|
|
2093
|
-
id:
|
|
2094
|
-
uuid:
|
|
2095
|
-
name:
|
|
2096
|
-
email:
|
|
2097
|
-
createdAt:
|
|
2098
|
-
updatedAt:
|
|
2099
|
-
deletedAt:
|
|
2104
|
+
id: Blueprint.int().notNull().primary().autoIncrement(),
|
|
2105
|
+
uuid: Blueprint.varchar(50).null(),
|
|
2106
|
+
name: Blueprint.varchar(191).notNull(),
|
|
2107
|
+
email: Blueprint.varchar(191).notNull(),
|
|
2108
|
+
createdAt: Blueprint.timestamp().null().bindColumn('created_at'),
|
|
2109
|
+
updatedAt: Blueprint.timestamp().null().bindColumn('updated_at'),
|
|
2110
|
+
deletedAt: Blueprint.timestamp().null().bindColumn('deleted_at')
|
|
2100
2111
|
}
|
|
2101
2112
|
|
|
2102
2113
|
|
|
@@ -2141,13 +2152,13 @@ class User extends Model {
|
|
|
2141
2152
|
super();
|
|
2142
2153
|
this.useCamelCase();
|
|
2143
2154
|
this.useSchema({
|
|
2144
|
-
id:
|
|
2145
|
-
uuid:
|
|
2146
|
-
name:
|
|
2147
|
-
email:
|
|
2148
|
-
createdAt:
|
|
2149
|
-
updatedAt:
|
|
2150
|
-
deletedAt:
|
|
2155
|
+
id: Blueprint.int().notNull().primary().autoIncrement(),
|
|
2156
|
+
uuid: Blueprint.varchar(50).null(),
|
|
2157
|
+
name: Blueprint.varchar(191).notNull(),
|
|
2158
|
+
email: Blueprint.varchar(191).notNull(),
|
|
2159
|
+
createdAt: Blueprint.timestamp().null(),
|
|
2160
|
+
updatedAt: Blueprint.timestamp().null(),
|
|
2161
|
+
deletedAt: Blueprint.timestamp().null(),
|
|
2151
2162
|
});
|
|
2152
2163
|
|
|
2153
2164
|
// validate input when create or update reference to the schema in 'this.useSchema'
|
|
@@ -2215,13 +2226,13 @@ class User extends Model {
|
|
|
2215
2226
|
});
|
|
2216
2227
|
|
|
2217
2228
|
this.useSchema({
|
|
2218
|
-
id:
|
|
2219
|
-
uuid:
|
|
2220
|
-
email:
|
|
2221
|
-
name:
|
|
2222
|
-
created_at:
|
|
2223
|
-
updated_at:
|
|
2224
|
-
deleted_at:
|
|
2229
|
+
id: Blueprint.int().notNull().primary().autoIncrement(),
|
|
2230
|
+
uuid: Blueprint.varchar(50).null(),
|
|
2231
|
+
email: Blueprint.int().notNull().unique(),
|
|
2232
|
+
name: Blueprint.varchar(255).null(),
|
|
2233
|
+
created_at: Blueprint.timestamp().null(),
|
|
2234
|
+
updated_at: Blueprint.timestamp().null(),
|
|
2235
|
+
deleted_at: Blueprint.timestamp().null(),
|
|
2225
2236
|
});
|
|
2226
2237
|
}
|
|
2227
2238
|
}
|
|
@@ -2234,18 +2245,18 @@ class Post extends Model {
|
|
|
2234
2245
|
this.hasMany({ name: "comments", model: Comment });
|
|
2235
2246
|
this.belongsTo({ name: "user", model: User });
|
|
2236
2247
|
this.useSchema({
|
|
2237
|
-
id:
|
|
2238
|
-
uuid:
|
|
2239
|
-
user_id:
|
|
2248
|
+
id: Blueprint.int().notNull().primary().autoIncrement(),
|
|
2249
|
+
uuid: Blueprint.varchar(50).null(),
|
|
2250
|
+
user_id: Blueprint.int().notNull().foreign({
|
|
2240
2251
|
references: "id",
|
|
2241
2252
|
on: User,
|
|
2242
2253
|
onDelete: "CASCADE",
|
|
2243
2254
|
onUpdate: "CASCADE",
|
|
2244
2255
|
}),
|
|
2245
|
-
title:
|
|
2246
|
-
created_at:
|
|
2247
|
-
updated_at:
|
|
2248
|
-
deleted_at:
|
|
2256
|
+
title: Blueprint.varchar(255).null(),
|
|
2257
|
+
created_at: Blueprint.timestamp().null(),
|
|
2258
|
+
updated_at: Blueprint.timestamp().null(),
|
|
2259
|
+
deleted_at: Blueprint.timestamp().null(),
|
|
2249
2260
|
});
|
|
2250
2261
|
}
|
|
2251
2262
|
}
|
|
@@ -2271,14 +2282,14 @@ import { Model , Blueprint , TSchema } from 'tspace-mysql'
|
|
|
2271
2282
|
import Phone from '../Phone'
|
|
2272
2283
|
|
|
2273
2284
|
const schemaUser = {
|
|
2274
|
-
id :
|
|
2275
|
-
uuid :
|
|
2276
|
-
email :
|
|
2277
|
-
name :
|
|
2278
|
-
username :
|
|
2279
|
-
password :
|
|
2280
|
-
createdAt :
|
|
2281
|
-
updatedAt :
|
|
2285
|
+
id :Blueprint.int().notNull().primary().autoIncrement(),
|
|
2286
|
+
uuid :Blueprint.varchar(50).null(),
|
|
2287
|
+
email :Blueprint.varchar(50).null(),
|
|
2288
|
+
name :Blueprint.varchar(255).null(),
|
|
2289
|
+
username : Blueprint.varchar(255).null(),
|
|
2290
|
+
password : Blueprint.varchar(255).null(),
|
|
2291
|
+
createdAt :Blueprint.timestamp().null(),
|
|
2292
|
+
updatedAt :Blueprint.timestamp().null()
|
|
2282
2293
|
}
|
|
2283
2294
|
|
|
2284
2295
|
type TSchemaUser = TSchema<typeof schemaUser>
|
|
@@ -2301,12 +2312,12 @@ export default User
|
|
|
2301
2312
|
import { Model , Blueprint , TSchema } from 'tspace-mysql'
|
|
2302
2313
|
import { User } from './User.ts'
|
|
2303
2314
|
const schemaPhone = {
|
|
2304
|
-
id :
|
|
2305
|
-
uuid :
|
|
2306
|
-
userId :
|
|
2307
|
-
number :
|
|
2308
|
-
createdAt :
|
|
2309
|
-
updatedAt :
|
|
2315
|
+
id :Blueprint.int().notNull().primary().autoIncrement(),
|
|
2316
|
+
uuid :Blueprint.varchar(50).null(),
|
|
2317
|
+
userId : Blueprint.int().notNull(),
|
|
2318
|
+
number :Blueprint.varchar(50).notNull(),
|
|
2319
|
+
createdAt :Blueprint.timestamp().null(),
|
|
2320
|
+
updatedAt :Blueprint.timestamp().null()
|
|
2310
2321
|
}
|
|
2311
2322
|
|
|
2312
2323
|
type TSchemaPhone = TSchema<typeof schemaPhone>
|
|
@@ -2544,14 +2555,14 @@ import { Model , Blueprint , TSchema , TRelation } from 'tspace-mysql'
|
|
|
2544
2555
|
import { Phone } from '../Phone'
|
|
2545
2556
|
|
|
2546
2557
|
const schemaUser = {
|
|
2547
|
-
id :
|
|
2548
|
-
uuid :
|
|
2549
|
-
email :
|
|
2550
|
-
name :
|
|
2551
|
-
username :
|
|
2552
|
-
password :
|
|
2553
|
-
createdAt :
|
|
2554
|
-
updatedAt :
|
|
2558
|
+
id :Blueprint.int().notNull().primary().autoIncrement(),
|
|
2559
|
+
uuid :Blueprint.varchar(50).null(),
|
|
2560
|
+
email :Blueprint.varchar(50).null(),
|
|
2561
|
+
name :Blueprint.varchar(255).null(),
|
|
2562
|
+
username : Blueprint.varchar(255).null(),
|
|
2563
|
+
password : Blueprint.varchar(255).null(),
|
|
2564
|
+
createdAt :Blueprint.timestamp().null(),
|
|
2565
|
+
updatedAt :Blueprint.timestamp().null()
|
|
2555
2566
|
}
|
|
2556
2567
|
|
|
2557
2568
|
type TSchemaUser = TSchema<typeof schemaUser>
|
|
@@ -2582,12 +2593,12 @@ import { Model , Blueprint , TSchema , TRelation } from 'tspace-mysql'
|
|
|
2582
2593
|
import { User } from './User.ts'
|
|
2583
2594
|
|
|
2584
2595
|
const schemaPhone = {
|
|
2585
|
-
id :
|
|
2586
|
-
uuid :
|
|
2587
|
-
userId :
|
|
2588
|
-
number :
|
|
2589
|
-
createdAt :
|
|
2590
|
-
updatedAt :
|
|
2596
|
+
id :Blueprint.int().notNull().primary().autoIncrement(),
|
|
2597
|
+
uuid :Blueprint.varchar(50).null(),
|
|
2598
|
+
userId : Blueprint.int().notNull(),
|
|
2599
|
+
number :Blueprint.varchar(50).notNull(),
|
|
2600
|
+
createdAt :Blueprint.timestamp().null(),
|
|
2601
|
+
updatedAt :Blueprint.timestamp().null()
|
|
2591
2602
|
}
|
|
2592
2603
|
|
|
2593
2604
|
type TSchemaPhone = TSchema<typeof schemaPhone>
|
|
@@ -2661,7 +2672,6 @@ It provides methods for querying, inserting, updating, and deleting records in t
|
|
|
2661
2672
|
```js
|
|
2662
2673
|
import { Repository , TRepository , Operator } from 'tspace-mysql'
|
|
2663
2674
|
import { User } from '../Models/User'
|
|
2664
|
-
import { Phone } from '../Models/Phone'
|
|
2665
2675
|
|
|
2666
2676
|
const userRepository = Repository.bind(User)
|
|
2667
2677
|
const needPhone = true
|
|
@@ -2706,24 +2716,6 @@ const findFullName = await userRepository.findOne({
|
|
|
2706
2716
|
`CONCAT(firstName," ",lastName) LIKE '%${search}%'`
|
|
2707
2717
|
]
|
|
2708
2718
|
})
|
|
2709
|
-
|
|
2710
|
-
// ------- relationship -------
|
|
2711
|
-
|
|
2712
|
-
const userHasPhones = await userRepository.findOne({
|
|
2713
|
-
select : ['*'],
|
|
2714
|
-
where : {
|
|
2715
|
-
id: 1
|
|
2716
|
-
},
|
|
2717
|
-
relations : ['phone'],
|
|
2718
|
-
relationQuery:{
|
|
2719
|
-
name : 'phone',
|
|
2720
|
-
callback: () : TRepository<Phone> => ({ // add type for the callback know to check type of the model
|
|
2721
|
-
select: ['id', 'userId', 'name'],
|
|
2722
|
-
relations : ['user']
|
|
2723
|
-
})
|
|
2724
|
-
}
|
|
2725
|
-
})
|
|
2726
|
-
|
|
2727
2719
|
```
|
|
2728
2720
|
### Repository Insert Statements
|
|
2729
2721
|
```js
|
|
@@ -2846,6 +2838,41 @@ try {
|
|
|
2846
2838
|
|
|
2847
2839
|
```
|
|
2848
2840
|
|
|
2841
|
+
### Repository Relations
|
|
2842
|
+
```js
|
|
2843
|
+
import { Repository , TRepository , Operator } from 'tspace-mysql'
|
|
2844
|
+
import { User } from '../Models/User'
|
|
2845
|
+
import { Phone } from '../Models/Phone'
|
|
2846
|
+
|
|
2847
|
+
const userRepository = Repository.bind(User)
|
|
2848
|
+
|
|
2849
|
+
const userHasPhones = await userRepository.findOne({
|
|
2850
|
+
select : ['*'],
|
|
2851
|
+
where : {
|
|
2852
|
+
id: 1
|
|
2853
|
+
},
|
|
2854
|
+
relations : ['phone'],
|
|
2855
|
+
relationQuery:{
|
|
2856
|
+
name : 'phone',
|
|
2857
|
+
callback: () : TRepository<Phone> => ({ // add type for the callback know to check type of the model
|
|
2858
|
+
select: ['id', 'userId', 'name'],
|
|
2859
|
+
relations : ['user']
|
|
2860
|
+
})
|
|
2861
|
+
}
|
|
2862
|
+
})
|
|
2863
|
+
|
|
2864
|
+
const phoneRepository = Repository.bind(Phone)
|
|
2865
|
+
|
|
2866
|
+
const phoneBelongUser = await phoneRepository.findOne({
|
|
2867
|
+
select : ['*'],
|
|
2868
|
+
where : {
|
|
2869
|
+
id: 1
|
|
2870
|
+
},
|
|
2871
|
+
relations : ['user']
|
|
2872
|
+
})
|
|
2873
|
+
|
|
2874
|
+
```
|
|
2875
|
+
|
|
2849
2876
|
## Blueprint
|
|
2850
2877
|
|
|
2851
2878
|
Blueprint is a tool used for defining database schemas programmatically.
|
|
@@ -2855,17 +2882,17 @@ It allows developers to describe the structure of their database tables using a
|
|
|
2855
2882
|
import { Schema , Blueprint , DB } from 'tspace-mysql'
|
|
2856
2883
|
(async () => {
|
|
2857
2884
|
await new Schema().table('users', {
|
|
2858
|
-
id :
|
|
2859
|
-
// or id :
|
|
2860
|
-
uuid :
|
|
2861
|
-
name :
|
|
2862
|
-
email :
|
|
2863
|
-
email_verify :
|
|
2864
|
-
password :
|
|
2865
|
-
json :
|
|
2866
|
-
created_at :
|
|
2867
|
-
updated_at :
|
|
2868
|
-
deleted_at :
|
|
2885
|
+
id : Blueprint.int().notNull().primary().autoIncrement(),
|
|
2886
|
+
// or id : Blueprint.serial().primary(),
|
|
2887
|
+
uuid : Blueprint.varchar(120).null()
|
|
2888
|
+
name : Blueprint.varchar(120).default('name'),
|
|
2889
|
+
email : Blueprint.varchar(255).unique().notNull(),
|
|
2890
|
+
email_verify : Blueprint.tinyInt(),
|
|
2891
|
+
password : Blueprint.varchar(255),
|
|
2892
|
+
json : Blueprint.json(),
|
|
2893
|
+
created_at : Blueprint.null().timestamp(),
|
|
2894
|
+
updated_at : Blueprint.null().timestamp(),
|
|
2895
|
+
deleted_at : Blueprint.null().timestamp()
|
|
2869
2896
|
})
|
|
2870
2897
|
/**
|
|
2871
2898
|
*
|
|
@@ -54,18 +54,35 @@ class PoolConnection extends events_1.EventEmitter {
|
|
|
54
54
|
*/
|
|
55
55
|
connection() {
|
|
56
56
|
const pool = (0, mysql2_1.createPool)(Object.fromEntries(this.OPTIONS));
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
57
|
+
/**
|
|
58
|
+
* After the server is listening, verify that the pool has successfully connected to the database.
|
|
59
|
+
* @protected {Pool} pool
|
|
60
|
+
* @returns {void}
|
|
61
|
+
*/
|
|
62
|
+
setTimeout(() => {
|
|
63
|
+
pool.getConnection((err, connection) => {
|
|
64
|
+
if (err == null || !err) {
|
|
65
|
+
this.emit('CONNECTION', pool);
|
|
66
|
+
connection.query(`SHOW VARIABLES LIKE 'version%'`, (err, results) => {
|
|
67
|
+
connection.release();
|
|
68
|
+
if (err)
|
|
69
|
+
return;
|
|
70
|
+
const message = [
|
|
71
|
+
results.find(v => (v === null || v === void 0 ? void 0 : v.Variable_name) === 'version'),
|
|
72
|
+
results.find(v => (v === null || v === void 0 ? void 0 : v.Variable_name) === 'version_comment')
|
|
73
|
+
].map(v => v === null || v === void 0 ? void 0 : v.Value).join(' - ');
|
|
74
|
+
console.log(this._messageConnected.bind(this)(`${message}.`));
|
|
75
|
+
});
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
const message = this._messageError.bind(this);
|
|
79
|
+
process.nextTick(() => {
|
|
80
|
+
console.log(message(err.message == null || err.message === '' ? err.code : err.message));
|
|
81
|
+
if (options_1.default.CONNECTION_ERROR)
|
|
82
|
+
return process.exit();
|
|
83
|
+
});
|
|
67
84
|
});
|
|
68
|
-
});
|
|
85
|
+
}, 1000 * 2);
|
|
69
86
|
pool.on('release', (connection) => {
|
|
70
87
|
this.emit('RELEASE', connection);
|
|
71
88
|
});
|
|
@@ -163,7 +180,7 @@ class PoolConnection extends events_1.EventEmitter {
|
|
|
163
180
|
dateStrings: Boolean(options_1.default.DATE_STRINGS),
|
|
164
181
|
connectTimeout: Number.isNaN(Number(options_1.default.TIMEOUT)) ? 60 * 1000 : Number(options_1.default.TIMEOUT),
|
|
165
182
|
waitForConnections: Boolean(options_1.default.WAIT_FOR_CONNECTIONS),
|
|
166
|
-
queueLimit: Number.isNaN(Number(options_1.default.QUEUE_LIMIT) ? 0 : Number(options_1.default.QUEUE_LIMIT)
|
|
183
|
+
queueLimit: Number.isNaN(Number(options_1.default.QUEUE_LIMIT)) ? 0 : Number(options_1.default.QUEUE_LIMIT),
|
|
167
184
|
charset: String(options_1.default.CHARSET),
|
|
168
185
|
host: String(options_1.default.HOST),
|
|
169
186
|
port: Number.isNaN(Number(options_1.default.PORT)) ? 3306 : Number(options_1.default.PORT),
|
|
@@ -254,6 +271,20 @@ class PoolConnection extends events_1.EventEmitter {
|
|
|
254
271
|
}
|
|
255
272
|
return data;
|
|
256
273
|
}
|
|
274
|
+
_messageConnected(message) {
|
|
275
|
+
return `
|
|
276
|
+
\x1b[1m\x1b[32m
|
|
277
|
+
Connection established to the database.
|
|
278
|
+
Version : ${message !== null && message !== void 0 ? message : ''} \x1b[0m
|
|
279
|
+
------------------------------- \x1b[30m
|
|
280
|
+
HOST : ${this.OPTIONS.get('host')}
|
|
281
|
+
PORT : ${this.OPTIONS.get('port')}
|
|
282
|
+
DATABASE : ${this.OPTIONS.get('database')}
|
|
283
|
+
USERNAME : ${this.OPTIONS.get('user')}
|
|
284
|
+
PASSWORD : ${this.OPTIONS.get('password')} \x1b[0m
|
|
285
|
+
-------------------------------
|
|
286
|
+
`;
|
|
287
|
+
}
|
|
257
288
|
_messageError(message) {
|
|
258
289
|
return `
|
|
259
290
|
\x1b[1m\x1b[31m
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/connection/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAwB;AACxB,gDAA0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/connection/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,15 +26,15 @@ const env = {
|
|
|
26
26
|
USERNAME: ENV.DB_USERNAME || ENV.TSPACE_USERNAME || ENV.DB_USER,
|
|
27
27
|
PASSWORD: ENV.DB_PASSWORD || ENV.TSPACE_PASSWORD || '',
|
|
28
28
|
DATABASE: ENV.DB_DATABASE || ENV.TSPACE_DATABASE,
|
|
29
|
-
CONNECTION_LIMIT: ENV.DB_CONNECTION_LIMIT || ENV.TSPACE_CONNECTION_LIMIT ||
|
|
29
|
+
CONNECTION_LIMIT: ENV.DB_CONNECTION_LIMIT || ENV.TSPACE_CONNECTION_LIMIT || 151,
|
|
30
30
|
QUEUE_LIMIT: ENV.DB_QUEUE_LIMIT || ENV.TSPACE_QUEUE_LIMIT || 0,
|
|
31
|
-
TIMEOUT: ENV.DB_TIMEOUT || ENV.TSPACE_TIMEOUT || 1000 *
|
|
31
|
+
TIMEOUT: ENV.DB_TIMEOUT || ENV.TSPACE_TIMEOUT || 1000 * 90,
|
|
32
32
|
CHARSET: ENV.DB_CHARSET || ENV.TSPACE_CHARSET || 'utf8mb4',
|
|
33
33
|
CONNECTION_ERROR: ENV.DB_CONNECTION_ERROR || ENV.TSPACE_CONNECTION_ERROR || false,
|
|
34
34
|
WAIT_FOR_CONNECTIONS: ENV.DB_WAIT_FOR_CONNECTIONS || ENV.TSPACE_WAIT_FOR_CONNECTIONS || true,
|
|
35
|
-
DATE_STRINGS: ENV.DB_DATE_STRINGS || ENV.TSPACE_DATE_STRINGS ||
|
|
35
|
+
DATE_STRINGS: ENV.DB_DATE_STRINGS || ENV.TSPACE_DATE_STRINGS || true,
|
|
36
36
|
KEEP_ALIVE_DELAY: ENV.DB_KEEP_ALIVE_DELAY || ENV.TSPACE_KEEP_ALIVE_DELAY || 0,
|
|
37
|
-
ENABLE_KEEP_ALIVE: ENV.DB_ENABLE_KEEP_ALIVE || ENV.TSPACE_ENABLE_KEEP_ALIVE ||
|
|
37
|
+
ENABLE_KEEP_ALIVE: ENV.DB_ENABLE_KEEP_ALIVE || ENV.TSPACE_ENABLE_KEEP_ALIVE || true,
|
|
38
38
|
MULTIPLE_STATEMENTS: ENV.MULTIPLE_STATEMENTS || ENV.TSPACE_MULTIPLE_STATEMENTS || false
|
|
39
39
|
};
|
|
40
40
|
for (const [key, value] of Object.entries(env)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../src/lib/connection/options.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA6B;AAC7B,gDAA2B;AAC3B,4CAAyB;AAoBzB,MAAM,WAAW,GAAG,GAAY,EAAE;;IAC9B,MAAM,QAAQ,GAAG,MAAA,OAAO,CAAC,GAAG,0CAAE,QAAQ,CAAA;IACtC,MAAM,GAAG,GAAG,cAAI,CAAC,IAAI,CAAC,cAAI,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAA;IAC7C,IAAG,QAAQ,IAAI,IAAI;QAAG,OAAO,GAAG,CAAA;IAChC,MAAM,iBAAiB,GAAG,cAAI,CAAC,IAAI,CAAC,cAAI,CAAC,OAAO,EAAE,EAAG,QAAQ,QAAQ,EAAE,CAAC,CAAA;IACxE,IAAI,YAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC;QAAE,OAAO,iBAAiB,CAAA;IAE9D,OAAO,GAAG,CAAA;AACd,CAAC,CAAA;AAED,gBAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAG,WAAW,EAAE,EAAE,CAAC,CAAA;AAEvC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;AAEvB,MAAM,GAAG,GAAuC;IAC5C,IAAI,EAAsB,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,WAAW,IAAI,WAAW;IACvE,IAAI,EAAsB,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,WAAW,IAAI,IAAI;IAChE,QAAQ,EAAkB,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,eAAe,IAAI,GAAG,CAAC,OAAO;IAC/E,QAAQ,EAAkB,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,eAAe,IAAI,EAAE;IACtE,QAAQ,EAAkB,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,eAAe;IAChE,gBAAgB,EAAU,GAAG,CAAC,mBAAmB,IAAI,GAAG,CAAC,uBAAuB,IAAI,
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../src/lib/connection/options.ts"],"names":[],"mappings":"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"}
|
|
@@ -2822,7 +2822,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
|
|
|
2822
2822
|
`${this.$state.get('TABLE_NAME')}`,
|
|
2823
2823
|
`${this.$constants('WHERE')} id`,
|
|
2824
2824
|
`${this.$constants('IN')}`,
|
|
2825
|
-
`(${data.map((a) =>
|
|
2825
|
+
`(${data.map((a) => `'${a}'`).join(',') || ['0']})`
|
|
2826
2826
|
].join(' ');
|
|
2827
2827
|
const groups = yield this._queryStatement(sqlGroups);
|
|
2828
2828
|
const resultData = results.map((result) => {
|
|
@@ -3624,7 +3624,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
|
|
|
3624
3624
|
var _a;
|
|
3625
3625
|
let values = [];
|
|
3626
3626
|
for (let objects of data) {
|
|
3627
|
-
this.$utils.covertDataToDateIfDate(
|
|
3627
|
+
this.$utils.covertDataToDateIfDate(objects);
|
|
3628
3628
|
const vals = Object.values(objects).map((value) => {
|
|
3629
3629
|
if (typeof value === 'string' && !(value.includes(this.$constants('RAW')))) {
|
|
3630
3630
|
value = this.$utils.escapeActions(value);
|