Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
public
/
sequelize
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
不要怂,就是干,撸起袖子干!
Commit aca4fbc1
authored
Mar 19, 2021
by
Tony Brix
Committed by
GitHub
Mar 19, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: update uuid (#13124)
1 parent
32d1e9e4
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
7 deletions
lib/dialects/abstract/query-generator.js
lib/dialects/abstract/query-generator/transaction.js
lib/dialects/abstract/query.js
lib/utils.js
package.json
lib/dialects/abstract/query-generator.js
View file @
aca4fbc
...
...
@@ -2,7 +2,7 @@
const
util
=
require
(
'util'
);
const
_
=
require
(
'lodash'
);
const
uuidv4
=
require
(
'uuid
/v4'
)
;
const
uuidv4
=
require
(
'uuid
'
).
v4
;
const
semver
=
require
(
'semver'
);
const
Utils
=
require
(
'../../utils'
);
...
...
lib/dialects/abstract/query-generator/transaction.js
View file @
aca4fbc
'use strict'
;
const
uuidv4
=
require
(
'uuid
/v4'
)
;
const
uuidv4
=
require
(
'uuid
'
).
v4
;
const
TransactionQueries
=
{
/**
...
...
lib/dialects/abstract/query.js
View file @
aca4fbc
...
...
@@ -5,7 +5,7 @@ const SqlString = require('../../sql-string');
const
QueryTypes
=
require
(
'../../query-types'
);
const
Dot
=
require
(
'dottie'
);
const
deprecations
=
require
(
'../../utils/deprecations'
);
const
uuid
=
require
(
'uuid
/v4'
)
;
const
uuid
=
require
(
'uuid
'
).
v4
;
class
AbstractQuery
{
...
...
@@ -334,7 +334,7 @@ class AbstractQuery {
const
logQueryParameters
=
this
.
sequelize
.
options
.
logQueryParameters
||
options
.
logQueryParameters
;
const
startTime
=
Date
.
now
();
let
logParameter
=
''
;
if
(
logQueryParameters
&&
parameters
)
{
const
delimiter
=
sql
.
endsWith
(
';'
)
?
''
:
';'
;
let
paramStr
;
...
...
lib/utils.js
View file @
aca4fbc
...
...
@@ -3,8 +3,8 @@
const
DataTypes
=
require
(
'./data-types'
);
const
SqlString
=
require
(
'./sql-string'
);
const
_
=
require
(
'lodash'
);
const
uuidv1
=
require
(
'uuid
/v1'
)
;
const
uuidv4
=
require
(
'uuid
/v4'
)
;
const
uuidv1
=
require
(
'uuid
'
).
v1
;
const
uuidv4
=
require
(
'uuid
'
).
v4
;
const
Promise
=
require
(
'./promise'
);
const
operators
=
require
(
'./operators'
);
const
operatorsSet
=
new
Set
(
_
.
values
(
operators
));
...
...
package.json
View file @
aca4fbc
...
...
@@ -42,7 +42,7 @@
"semver"
:
"^6.3.0"
,
"sequelize-pool"
:
"^2.3.0"
,
"toposort-class"
:
"^1.0.1"
,
"uuid"
:
"^
3.3.3
"
,
"uuid"
:
"^
8.3.2
"
,
"validator"
:
"^10.11.0"
,
"wkx"
:
"^0.4.8"
},
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment