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 d43f162d
authored
Mar 27, 2019
by
Sushant
Committed by
GitHub
Mar 27, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(postgres): quote trigger query identifiers (#10632)
1 parent
ab7a9548
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
9 deletions
lib/dialects/postgres/query-generator.js
test/unit/dialects/postgres/query-generator.test.js
lib/dialects/postgres/query-generator.js
View file @
d43f162
...
...
@@ -582,22 +582,21 @@ class PostgresQueryGenerator extends AbstractQueryGenerator {
}
createTrigger
(
tableName
,
triggerName
,
eventType
,
fireOnSpec
,
functionName
,
functionParams
,
optionsArray
)
{
const
decodedEventType
=
this
.
decodeTriggerEventType
(
eventType
);
const
eventSpec
=
this
.
expandTriggerEventSpec
(
fireOnSpec
);
const
expandedOptions
=
this
.
expandOptions
(
optionsArray
);
const
paramList
=
this
.
expandFunctionParamList
(
functionParams
);
return
`CREATE
${
this
.
triggerEventTypeIsConstraint
(
eventType
)}
TRIGGER
${
t
riggerName
}
${
decodedEventType
}
${
eventSpec
}
ON
${
t
ableName
}${
expandedOptions
?
`
${
expandedOptions
}
`
:
''
}
EXECUTE PROCEDURE
${
functionName
}
(
${
paramList
}
);`
;
return
`CREATE
${
this
.
triggerEventTypeIsConstraint
(
eventType
)}
TRIGGER
${
t
his
.
quoteIdentifier
(
triggerName
)
}
${
decodedEventType
}
${
eventSpec
}
ON
${
t
his
.
quoteTable
(
tableName
)
}${
expandedOptions
?
`
${
expandedOptions
}
`
:
''
}
EXECUTE PROCEDURE
${
functionName
}
(
${
paramList
}
);`
;
}
dropTrigger
(
tableName
,
triggerName
)
{
return
`DROP TRIGGER
${
t
riggerName
}
ON
${
tableName
}
RESTRICT;`
;
return
`DROP TRIGGER
${
t
his
.
quoteIdentifier
(
triggerName
)}
ON
${
this
.
quoteTable
(
tableName
)
}
RESTRICT;`
;
}
renameTrigger
(
tableName
,
oldTriggerName
,
newTriggerName
)
{
return
`ALTER TRIGGER
${
oldTriggerName
}
ON
${
tableName
}
RENAME TO
${
newTriggerName
}
;`
;
return
`ALTER TRIGGER
${
this
.
quoteIdentifier
(
oldTriggerName
)}
ON
${
this
.
quoteTable
(
tableName
)}
RENAME TO
${
this
.
quoteIdentifier
(
newTriggerName
)
}
;`
;
}
createFunction
(
functionName
,
params
,
returnType
,
language
,
body
,
options
)
{
...
...
test/unit/dialects/postgres/query-generator.test.js
View file @
d43f162
...
...
@@ -1148,21 +1148,36 @@ if (dialect.startsWith('postgres')) {
createTrigger
:
[
{
arguments
:
[
'myTable'
,
'myTrigger'
,
'after'
,
[
'insert'
],
'myFunction'
,
[],
[]],
expectation
:
'CREATE TRIGGER
myTrigger AFTER INSERT ON myTable
EXECUTE PROCEDURE myFunction();'
expectation
:
'CREATE TRIGGER
"myTrigger" AFTER INSERT ON "myTable"
EXECUTE PROCEDURE myFunction();'
},
{
arguments
:
[
'myTable'
,
'myTrigger'
,
'before'
,
[
'insert'
,
'update'
],
'myFunction'
,
[{
name
:
'bar'
,
type
:
'INTEGER'
}],
[]],
expectation
:
'CREATE TRIGGER
myTrigger BEFORE INSERT OR UPDATE ON myTable
EXECUTE PROCEDURE myFunction(bar INTEGER);'
expectation
:
'CREATE TRIGGER
"myTrigger" BEFORE INSERT OR UPDATE ON "myTable"
EXECUTE PROCEDURE myFunction(bar INTEGER);'
},
{
arguments
:
[
'myTable'
,
'myTrigger'
,
'instead_of'
,
[
'insert'
,
'update'
],
'myFunction'
,
[],
[
'FOR EACH ROW'
]],
expectation
:
'CREATE TRIGGER
myTrigger INSTEAD OF INSERT OR UPDATE ON myTable
FOR EACH ROW EXECUTE PROCEDURE myFunction();'
expectation
:
'CREATE TRIGGER
"myTrigger" INSTEAD OF INSERT OR UPDATE ON "myTable"
FOR EACH ROW EXECUTE PROCEDURE myFunction();'
},
{
arguments
:
[
'myTable'
,
'myTrigger'
,
'after_constraint'
,
[
'insert'
,
'update'
],
'myFunction'
,
[{
name
:
'bar'
,
type
:
'INTEGER'
}],
[
'FOR EACH ROW'
]],
expectation
:
'CREATE CONSTRAINT TRIGGER
myTrigger AFTER INSERT OR UPDATE ON myTable
FOR EACH ROW EXECUTE PROCEDURE myFunction(bar INTEGER);'
expectation
:
'CREATE CONSTRAINT TRIGGER
"myTrigger" AFTER INSERT OR UPDATE ON "myTable"
FOR EACH ROW EXECUTE PROCEDURE myFunction(bar INTEGER);'
}
],
dropTrigger
:
[
{
arguments
:
[
'myTable'
,
'myTrigger'
],
expectation
:
'DROP TRIGGER "myTrigger" ON "myTable" RESTRICT;'
}
],
renameTrigger
:
[
{
arguments
:
[
'myTable'
,
'oldTrigger'
,
'newTrigger'
],
expectation
:
'ALTER TRIGGER "oldTrigger" ON "myTable" RENAME TO "newTrigger";'
}
],
getForeignKeyReferenceQuery
:
[
{
arguments
:
[
'myTable'
,
'myColumn'
],
...
...
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