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 c05a0342
authored
Jul 03, 2018
by
Bünyamin Benny Genel
Committed by
Sushant
Jul 03, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(dependency): uuid module deprecation warnings (#9619)
1 parent
9b46f913
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
9 deletions
lib/dialects/abstract/query-generator.js
lib/dialects/abstract/query-generator/transaction.js
lib/dialects/mysql/query.js
lib/utils.js
lib/dialects/abstract/query-generator.js
View file @
c05a034
...
...
@@ -3,7 +3,7 @@
const
util
=
require
(
'util'
);
const
_
=
require
(
'lodash'
);
const
Dottie
=
require
(
'dottie'
);
const
uuid
=
require
(
'uuid
'
);
const
uuid
v4
=
require
(
'uuid/v4
'
);
const
semver
=
require
(
'semver'
);
const
Utils
=
require
(
'../../utils'
);
...
...
@@ -183,7 +183,7 @@ class QueryGenerator {
// pg_temp functions are private per connection, so we never risk this function interfering with another one.
if
(
semver
.
gte
(
this
.
sequelize
.
options
.
databaseVersion
,
'9.2.0'
))
{
// >= 9.2 - Use a UUID but prefix with 'func_' (numbers first not allowed)
const
delimiter
=
'$func_'
+
uuid
.
v4
().
replace
(
/-/g
,
''
)
+
'$'
;
const
delimiter
=
'$func_'
+
uuidv4
().
replace
(
/-/g
,
''
)
+
'$'
;
options
.
exception
=
'WHEN unique_violation THEN GET STACKED DIAGNOSTICS sequelize_caught_exception = PG_EXCEPTION_DETAIL;'
;
valueQuery
=
'CREATE OR REPLACE FUNCTION pg_temp.testfunc(OUT response <%= table %>, OUT sequelize_caught_exception text) RETURNS RECORD AS '
+
delimiter
+
...
...
lib/dialects/abstract/query-generator/transaction.js
View file @
c05a034
'use strict'
;
const
uuid
=
require
(
'uuid
'
);
const
uuid
v4
=
require
(
'uuid/v4
'
);
const
TransactionQueries
=
{
/**
...
...
@@ -41,7 +41,7 @@ const TransactionQueries = {
},
generateTransactionId
()
{
return
uuid
.
v4
();
return
uuidv4
();
},
/**
...
...
lib/dialects/mysql/query.js
View file @
c05a034
...
...
@@ -3,7 +3,7 @@
const
Utils
=
require
(
'../../utils'
);
const
debug
=
Utils
.
getLogger
().
debugContext
(
'sql:mysql'
);
const
AbstractQuery
=
require
(
'../abstract/query'
);
const
uuid
=
require
(
'uuid
'
);
const
uuid
v4
=
require
(
'uuid/v4
'
);
const
sequelizeErrors
=
require
(
'../../errors'
);
const
_
=
require
(
'lodash'
);
...
...
@@ -14,7 +14,7 @@ class Query extends AbstractQuery {
this
.
instance
=
options
.
instance
;
this
.
model
=
options
.
model
;
this
.
sequelize
=
sequelize
;
this
.
uuid
=
uuid
.
v4
();
this
.
uuid
=
uuidv4
();
this
.
options
=
_
.
extend
({
logging
:
console
.
log
,
plain
:
false
,
...
...
lib/utils.js
View file @
c05a034
...
...
@@ -5,7 +5,8 @@ const SqlString = require('./sql-string');
const
_
=
require
(
'lodash'
);
const
parameterValidator
=
require
(
'./utils/parameter-validator'
);
const
Logger
=
require
(
'./utils/logger'
);
const
uuid
=
require
(
'uuid'
);
const
uuidv1
=
require
(
'uuid/v1'
);
const
uuidv4
=
require
(
'uuid/v4'
);
const
Promise
=
require
(
'./promise'
);
const
operators
=
require
(
'./operators'
);
const
operatorsArray
=
_
.
values
(
operators
);
...
...
@@ -266,9 +267,9 @@ function toDefaultValue(value, dialect) {
return
tmp
;
}
}
else
if
(
value
instanceof
DataTypes
.
UUIDV1
)
{
return
uuid
.
v1
();
return
uuidv1
();
}
else
if
(
value
instanceof
DataTypes
.
UUIDV4
)
{
return
uuid
.
v4
();
return
uuidv4
();
}
else
if
(
value
instanceof
DataTypes
.
NOW
)
{
return
now
(
dialect
);
}
else
if
(
_
.
isPlainObject
(
value
)
||
_
.
isArray
(
value
))
{
...
...
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