Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
qfq
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
typo3
qfq
Commits
74588e05
Commit
74588e05
authored
1 year ago
by
Carsten Rose
Browse files
Options
Downloads
Plain Diff
Merge branch 'S17461_include_with_keyword' into 'develop'
Include WITH keyword See merge request
!650
parents
6b231fcd
bd6313a3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!691
New version v24.3.0
,
!650
Include WITH keyword
Pipeline
#11737
passed
1 year ago
Stage: build
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
extension/Classes/Core/Database/Database.php
+1
-0
1 addition, 0 deletions
extension/Classes/Core/Database/Database.php
extension/Classes/Core/Evaluate.php
+1
-1
1 addition, 1 deletion
extension/Classes/Core/Evaluate.php
with
2 additions
and
1 deletion
extension/Classes/Core/Database/Database.php
+
1
−
0
View file @
74588e05
...
@@ -462,6 +462,7 @@ class Database {
...
@@ -462,6 +462,7 @@ class Database {
case
'SHOW'
:
case
'SHOW'
:
case
'DESCRIBE'
:
case
'DESCRIBE'
:
case
'EXPLAIN'
:
case
'EXPLAIN'
:
case
'WITH'
:
if
(
false
===
(
$result
=
$this
->
mysqli_stmt
->
get_result
()))
{
if
(
false
===
(
$result
=
$this
->
mysqli_stmt
->
get_result
()))
{
throw
new
\DbException
(
throw
new
\DbException
(
json_encode
([
ERROR_MESSAGE_TO_USER
=>
'Error DB execute'
,
ERROR_MESSAGE_TO_DEVELOPER
=>
'[ mysqli: '
.
$this
->
mysqli_stmt
->
errno
.
' ] '
.
$this
->
mysqli_stmt
->
error
.
$specificMessage
]),
json_encode
([
ERROR_MESSAGE_TO_USER
=>
'Error DB execute'
,
ERROR_MESSAGE_TO_DEVELOPER
=>
'[ mysqli: '
.
$this
->
mysqli_stmt
->
errno
.
' ] '
.
$this
->
mysqli_stmt
->
error
.
$specificMessage
]),
...
...
This diff is collapsed.
Click to expand it.
extension/Classes/Core/Evaluate.php
+
1
−
1
View file @
74588e05
...
@@ -51,7 +51,7 @@ class Evaluate {
...
@@ -51,7 +51,7 @@ class Evaluate {
private
$startDelimiterLength
=
0
;
private
$startDelimiterLength
=
0
;
private
$endDelimiter
=
''
;
private
$endDelimiter
=
''
;
private
$endDelimiterLength
=
0
;
private
$endDelimiterLength
=
0
;
private
$sqlKeywords
=
array
(
'SELECT '
,
'INSERT '
,
'DELETE '
,
'UPDATE '
,
'SHOW '
,
'REPLACE '
,
'TRUNCATE '
,
'DESCRIBE '
,
'EXPLAIN '
,
'SET '
);
private
$sqlKeywords
=
array
(
'SELECT '
,
'INSERT '
,
'DELETE '
,
'UPDATE '
,
'SHOW '
,
'REPLACE '
,
'TRUNCATE '
,
'DESCRIBE '
,
'EXPLAIN '
,
'SET
'
,
'WITH
'
);
private
$escapeTypeDefault
=
''
;
private
$escapeTypeDefault
=
''
;
private
$report
=
null
;
private
$report
=
null
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment