Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
z-push
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Björn Fischer
z-push
Commits
409bb184
Commit
409bb184
authored
Jul 27, 2016
by
Manfred Kutas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ZP-1002 replace tabs with spaces.
Released under the Affero GNU General Public License (AGPL) version 3.
parent
c95a539e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
sqlstatemachine.php
src/backend/sqlstatemachine/sqlstatemachine.php
+6
-6
No files found.
src/backend/sqlstatemachine/sqlstatemachine.php
View file @
409bb184
...
...
@@ -654,14 +654,14 @@ class SqlStateMachine implements IStateMachine {
* If the parameter is null then " IS NULL" is returned, else " = $key".
*
* @param array& $params $params[$key] will be unset, if is_null($params[$key])
* @param string $key eg. ":key"
* @param string $key eg. ":key"
*
* @access protected
* @return string
*/
protected
function
getSQLOp
(
&
$params
,
$key
)
{
if
(
is_null
(
$params
[
$key
]))
{
unset
(
$params
[
$key
]);
unset
(
$params
[
$key
]);
return
" IS NULL"
;
}
return
" =
$key
"
;
...
...
@@ -712,11 +712,11 @@ class SqlStateMachine implements IStateMachine {
protected
function
getStateHashStatement
(
&
$params
,
$key
=
':key'
)
{
if
(
!
isset
(
$this
->
stateHashStatement
)
||
$this
->
stateHashStatement
==
null
)
{
$sql
=
"SELECT updated_at FROM
{
$this
->
states_table
}
WHERE device_id = :devid AND state_type = :type AND uuid "
.
$this
->
getSQLOp
(
$params
,
$key
)
.
" AND counter = :counter"
;
$this
->
stateHashStatement
=
$this
->
getDbh
()
->
prepare
(
$sql
);
$this
->
stateHashStatement
=
$this
->
getDbh
()
->
prepare
(
$sql
);
}
else
{
$this
->
getSQLOp
(
$params
,
$key
);
// need to unset $params[':key'] for NULL
}
else
{
$this
->
getSQLOp
(
$params
,
$key
);
// need to unset $params[':key'] for NULL
}
return
$this
->
stateHashStatement
;
}
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
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 comment