Skip to content

Commit 273d957

Browse files
nijelnijel
committed
Aplly coding style fixes
Signed-off-by: Michal Čihař <[email protected]>
1 parent 21d143b commit 273d957

4 files changed

Lines changed: 25 additions & 31 deletions

File tree

‎src/Statement.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ public function validateClauseOrder($parser, $list)
452452
/**
453453
* For tracking JOIN clauses in a query
454454
* = 0 - JOIN not found till now
455-
* > 0 - Index of first JOIN clause in the statement
455+
* > 0 - Index of first JOIN clause in the statement.
456456
*
457457
* @var int
458458
*/
@@ -463,7 +463,7 @@ public function validateClauseOrder($parser, $list)
463463
* = 0 - JOIN not found till now
464464
* > 0 - Index of last JOIN clause
465465
* (which appears together with other JOINs)
466-
* in the statement
466+
* in the statement.
467467
*
468468
* @var int
469469
*/
@@ -483,7 +483,7 @@ public function validateClauseOrder($parser, $list)
483483
if ($minJoin === 0 && stripos($clauseType, 'JOIN')) {
484484
// First JOIN clause is detected
485485
$minJoin = $maxJoin = $clauseStartIdx;
486-
} elseif ($minJoin !== 0 && ! stripos($clauseType, 'JOIN')) {
486+
} elseif ($minJoin !== 0 && !stripos($clauseType, 'JOIN')) {
487487
// After a previous JOIN clause, a non-JOIN clause has been detected
488488
$maxJoin = $lastIdx;
489489
} elseif ($maxJoin < $clauseStartIdx && stripos($clauseType, 'JOIN')) {

‎src/Statements/LoadStatement.php‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,8 @@
77
namespace PhpMyAdmin\SqlParser\Statements;
88

99
use PhpMyAdmin\SqlParser\Components\ArrayObj;
10-
use PhpMyAdmin\SqlParser\Components\Condition;
1110
use PhpMyAdmin\SqlParser\Components\Expression;
1211
use PhpMyAdmin\SqlParser\Components\ExpressionArray;
13-
use PhpMyAdmin\SqlParser\Components\FunctionCall;
14-
use PhpMyAdmin\SqlParser\Components\IntoKeyword;
15-
use PhpMyAdmin\SqlParser\Components\JoinKeyword;
16-
use PhpMyAdmin\SqlParser\Components\Limit;
17-
use PhpMyAdmin\SqlParser\Components\OrderKeyword;
1812
use PhpMyAdmin\SqlParser\Components\OptionsArray;
1913
use PhpMyAdmin\SqlParser\Components\SetOperation;
2014
use PhpMyAdmin\SqlParser\Parser;
@@ -58,7 +52,7 @@ class LoadStatement extends Statement
5852
public static $OPTIONS = array(
5953
'LOW_PRIORITY' => 1,
6054
'CONCURRENT' => 1,
61-
'LOCAL' => 2
55+
'LOCAL' => 2,
6256
);
6357

6458
/**
@@ -84,7 +78,7 @@ class LoadStatement extends Statement
8478
);
8579

8680
/**
87-
* File name being used to load data
81+
* File name being used to load data.
8882
*
8983
* @var Expression
9084
*/
@@ -137,35 +131,35 @@ class LoadStatement extends Statement
137131
public $lines_options;
138132

139133
/**
140-
* Column names or user variables
134+
* Column names or user variables.
141135
*
142136
* @var ExpressionArray
143137
*/
144138
public $col_name_or_user_var;
145139

146140
/**
147-
* SET clause's updated values(optional)
141+
* SET clause's updated values(optional).
148142
*
149143
* @var SetOperation[]
150144
*/
151145
public $set;
152146

153147
/**
154-
* Ignore 'number' LINES/ROWS
148+
* Ignore 'number' LINES/ROWS.
155149
*
156150
* @var Expression
157151
*/
158152
public $ignore_number;
159153

160154
/**
161-
* REPLACE/IGNORE Keyword
155+
* REPLACE/IGNORE Keyword.
162156
*
163157
* @var string
164158
*/
165159
public $replace_ignore;
166160

167161
/**
168-
* LINES/ROWS Keyword
162+
* LINES/ROWS Keyword.
169163
*
170164
* @var string
171165
*/
@@ -232,7 +226,7 @@ public function parse(Parser $parser, TokensList $list)
232226
);
233227
++$list->idx;
234228

235-
/**
229+
/**
236230
* The state of the parser.
237231
*
238232
* @var int
@@ -290,7 +284,7 @@ public function parse(Parser $parser, TokensList $list)
290284
if ($token->type === Token::TYPE_KEYWORD
291285
&& $token->keyword === 'TABLE'
292286
) {
293-
$list->idx++;
287+
++$list->idx;
294288
$this->table = Expression::parse($parser, $list, array('parseField' => 'table'));
295289
$state = 3;
296290
} else {
@@ -345,23 +339,25 @@ public function parseFileOptions(Parser $parser, TokensList $list, $keyword = 'F
345339
}
346340
}
347341

348-
349-
public function parseKeywordsAccordingToState($parser, $list, $state) {
342+
public function parseKeywordsAccordingToState($parser, $list, $state)
343+
{
350344
$token = $list->tokens[$list->idx];
351345

352346
switch ($state) {
353347
case 3:
354348
if ($token->keyword === 'PARTITION') {
355-
$list->idx++;
349+
++$list->idx;
356350
$this->partition = ArrayObj::parse($parser, $list);
357351
$state = 4;
352+
358353
return $state;
359354
}
360355
case 4:
361356
if ($token->keyword === 'CHARACTER SET') {
362-
$list->idx++;
357+
++$list->idx;
363358
$this->charset_name = Expression::parse($parser, $list);
364359
$state = 5;
360+
365361
return $state;
366362
}
367363
case 5:
@@ -371,11 +367,12 @@ public function parseKeywordsAccordingToState($parser, $list, $state) {
371367
) {
372368
$this->parseFileOptions($parser, $list, $token->value);
373369
$state = 6;
370+
374371
return $state;
375372
}
376373
case 6:
377374
if ($token->keyword === 'IGNORE') {
378-
$list->idx++;
375+
++$list->idx;
379376

380377
$this->ignore_number = Expression::parse($parser, $list);
381378
$nextToken = $list->getNextOfType(Token::TYPE_KEYWORD);
@@ -387,18 +384,20 @@ public function parseKeywordsAccordingToState($parser, $list, $state) {
387384
$this->lines_rows = $nextToken->token;
388385
}
389386
$state = 7;
387+
390388
return $state;
391389
}
392390
case 7:
393391
if ($token->keyword === 'SET') {
394-
$list->idx++;
392+
++$list->idx;
395393
$this->set = SetOperation::parse($parser, $list);
396394
$state = 8;
395+
397396
return $state;
398397
}
399398
default:
400399
}
400+
401401
return $state;
402402
}
403-
404403
}

‎tests/Builder/LoadStatementTest.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ public function testBuilder()
3737
$stmt->build()
3838
);
3939

40-
4140
/* Assertion 3 */
4241
$query = 'LOAD DATA INFILE \'employee3.txt\' '
4342
. 'INTO TABLE employee FIELDS TERMINATED BY '
@@ -53,7 +52,6 @@ public function testBuilder()
5352
$stmt->build()
5453
);
5554

56-
5755
/* Assertion 4 */
5856
$query = 'LOAD DATA INFILE \'/tmp/test.txt\' IGNORE '
5957
. 'INTO TABLE test '
@@ -75,7 +73,6 @@ public function testBuilder()
7573
$stmt->build()
7674
);
7775

78-
7976
/* Assertion 5 */
8077
$query = 'LOAD DATA INFILE \'/tmp/test.txt\' REPLACE '
8178
. 'INTO TABLE test COLUMNS TERMINATED BY \',\' IGNORE 1 ROWS';
@@ -89,7 +86,6 @@ public function testBuilder()
8986
$stmt->build()
9087
);
9188

92-
9389
/* Assertion 6 */
9490
$query = 'LOAD DATA INFILE \'/tmp/test.txt\' IGNORE '
9591
. 'INTO TABLE test PARTITION (p0, p1, p2) CHARACTER SET \'utf8\' '
@@ -107,5 +103,4 @@ public function testBuilder()
107103
$stmt->build()
108104
);
109105
}
110-
111106
}

‎tests/Parser/LoadStatementTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function testLoadProvider()
3939
array('parser/parseLoadErr3'),
4040
array('parser/parseLoadErr4'),
4141
array('parser/parseLoadErr5'),
42-
array('parser/parseLoadErr6')
42+
array('parser/parseLoadErr6'),
4343
);
4444
}
4545
}

0 commit comments

Comments
 (0)