summaryrefslogtreecommitdiffstats
path: root/src/Components
diff options
context:
space:
mode:
Diffstat (limited to 'src/Components')
-rw-r--r--src/Components/ArrayObj.php4
-rw-r--r--src/Components/Condition.php4
-rw-r--r--src/Components/CreateDefinition.php57
-rw-r--r--src/Components/Expression.php38
-rw-r--r--src/Components/IntoKeyword.php27
-rw-r--r--src/Components/Key.php2
-rw-r--r--src/Components/OrderKeyword.php4
-rw-r--r--src/Components/ParameterDefinition.php18
-rw-r--r--src/Components/PartitionDefinition.php25
-rw-r--r--src/Components/Reference.php2
-rw-r--r--src/Components/RenameOperation.php4
-rw-r--r--src/Components/SetOperation.php4
12 files changed, 94 insertions, 95 deletions
diff --git a/src/Components/ArrayObj.php b/src/Components/ArrayObj.php
index feeb169..e86ddfd 100644
--- a/src/Components/ArrayObj.php
+++ b/src/Components/ArrayObj.php
@@ -182,8 +182,8 @@ class ArrayObj extends Component
return implode(', ', $component);
} elseif (!empty($component->raw)) {
return '(' . implode(', ', $component->raw) . ')';
- } else {
- return '(' . implode(', ', $component->values) . ')';
}
+
+ return '(' . implode(', ', $component->values) . ')';
}
}
diff --git a/src/Components/Condition.php b/src/Components/Condition.php
index 79899e8..99ab34c 100644
--- a/src/Components/Condition.php
+++ b/src/Components/Condition.php
@@ -220,8 +220,8 @@ class Condition extends Component
{
if (is_array($component)) {
return implode(' ', $component);
- } else {
- return $component->expr;
}
+
+ return $component->expr;
}
}
diff --git a/src/Components/CreateDefinition.php b/src/Components/CreateDefinition.php
index 2bf6198..0b5c584 100644
--- a/src/Components/CreateDefinition.php
+++ b/src/Components/CreateDefinition.php
@@ -8,8 +8,8 @@
namespace PhpMyAdmin\SqlParser\Components;
-use PhpMyAdmin\SqlParser\Context;
use PhpMyAdmin\SqlParser\Component;
+use PhpMyAdmin\SqlParser\Context;
use PhpMyAdmin\SqlParser\Parser;
use PhpMyAdmin\SqlParser\Token;
use PhpMyAdmin\SqlParser\TokensList;
@@ -201,6 +201,7 @@ class CreateDefinition extends Component
'An opening bracket was expected.',
$token
);
+
break;
}
} elseif ($state === 1) {
@@ -226,11 +227,11 @@ class CreateDefinition extends Component
);
return $ret;
- } else {
- // Non-reserved keywords are allowed without backquotes
- $expr->name = $token->value;
- $state = 2;
}
+
+ // Non-reserved keywords are allowed without backquotes
+ $expr->name = $token->value;
+ $state = 2;
} else {
$parser->error(
'A symbol name was expected!',
@@ -302,35 +303,35 @@ class CreateDefinition extends Component
{
if (is_array($component)) {
return "(\n " . implode(",\n ", $component) . "\n)";
- } else {
- $tmp = '';
-
- if ($component->isConstraint) {
- $tmp .= 'CONSTRAINT ';
- }
+ }
- if ((isset($component->name)) && ($component->name !== '')) {
- $tmp .= Context::escape($component->name) . ' ';
- }
+ $tmp = '';
- if (!empty($component->type)) {
- $tmp .= DataType::build(
- $component->type,
- array('lowercase' => true)
- ) . ' ';
- }
+ if ($component->isConstraint) {
+ $tmp .= 'CONSTRAINT ';
+ }
- if (!empty($component->key)) {
- $tmp .= $component->key . ' ';
- }
+ if ((isset($component->name)) && ($component->name !== '')) {
+ $tmp .= Context::escape($component->name) . ' ';
+ }
- if (!empty($component->references)) {
- $tmp .= 'REFERENCES ' . $component->references . ' ';
- }
+ if (!empty($component->type)) {
+ $tmp .= DataType::build(
+ $component->type,
+ array('lowercase' => true)
+ ) . ' ';
+ }
- $tmp .= $component->options;
+ if (!empty($component->key)) {
+ $tmp .= $component->key . ' ';
+ }
- return trim($tmp);
+ if (!empty($component->references)) {
+ $tmp .= 'REFERENCES ' . $component->references . ' ';
}
+
+ $tmp .= $component->options;
+
+ return trim($tmp);
}
}
diff --git a/src/Components/Expression.php b/src/Components/Expression.php
index d3668d7..a1b460b 100644
--- a/src/Components/Expression.php
+++ b/src/Components/Expression.php
@@ -7,8 +7,8 @@
namespace PhpMyAdmin\SqlParser\Components;
-use PhpMyAdmin\SqlParser\Context;
use PhpMyAdmin\SqlParser\Component;
+use PhpMyAdmin\SqlParser\Context;
use PhpMyAdmin\SqlParser\Parser;
use PhpMyAdmin\SqlParser\Token;
use PhpMyAdmin\SqlParser\TokensList;
@@ -418,28 +418,28 @@ class Expression extends Component
{
if (is_array($component)) {
return implode($component, ', ');
+ }
+
+ if ($component->expr !== '' && !is_null($component->expr)) {
+ $ret = $component->expr;
} else {
- if ($component->expr !== '' && !is_null($component->expr)) {
- $ret = $component->expr;
- } else {
- $fields = array();
- if ((isset($component->database)) && ($component->database !== '')) {
- $fields[] = $component->database;
- }
- if ((isset($component->table)) && ($component->table !== '')) {
- $fields[] = $component->table;
- }
- if ((isset($component->column)) && ($component->column !== '')) {
- $fields[] = $component->column;
- }
- $ret = implode('.', Context::escape($fields));
+ $fields = array();
+ if ((isset($component->database)) && ($component->database !== '')) {
+ $fields[] = $component->database;
}
-
- if (!empty($component->alias)) {
- $ret .= ' AS ' . Context::escape($component->alias);
+ if ((isset($component->table)) && ($component->table !== '')) {
+ $fields[] = $component->table;
+ }
+ if ((isset($component->column)) && ($component->column !== '')) {
+ $fields[] = $component->column;
}
+ $ret = implode('.', Context::escape($fields));
+ }
- return $ret;
+ if (!empty($component->alias)) {
+ $ret .= ' AS ' . Context::escape($component->alias);
}
+
+ return $ret;
}
}
diff --git a/src/Components/IntoKeyword.php b/src/Components/IntoKeyword.php
index a5c2d24..6c52f20 100644
--- a/src/Components/IntoKeyword.php
+++ b/src/Components/IntoKeyword.php
@@ -235,27 +235,26 @@ class IntoKeyword extends Component
public static function build($component, array $options = array())
{
if ($component->dest instanceof Expression) {
- $columns = !empty($component->columns) ?
- '(`' . implode('`, `', $component->columns) . '`)' : '';
+ $columns = !empty($component->columns) ? '(`' . implode('`, `', $component->columns) . '`)' : '';
return $component->dest . $columns;
} elseif (isset($component->values)) {
return ExpressionArray::build($component->values);
- } else {
- $ret = 'OUTFILE "' . $component->dest . '"';
+ }
- $fields_options_str = OptionsArray::build($component->fields_options);
- if (trim($fields_options_str) !== '') {
- $ret .= ($component->fields_keyword) ? ' FIELDS' : ' COLUMNS';
- $ret .= ' ' . $fields_options_str;
- }
+ $ret = 'OUTFILE "' . $component->dest . '"';
- $lines_options_str = OptionsArray::build($component->lines_options, array('expr' => true));
- if (trim($lines_options_str) !== '') {
- $ret .= ' LINES ' . $lines_options_str;
- }
+ $fields_options_str = OptionsArray::build($component->fields_options);
+ if (trim($fields_options_str) !== '') {
+ $ret .= ($component->fields_keyword) ? ' FIELDS' : ' COLUMNS';
+ $ret .= ' ' . $fields_options_str;
+ }
- return $ret;
+ $lines_options_str = OptionsArray::build($component->lines_options, array('expr' => true));
+ if (trim($lines_options_str) !== '') {
+ $ret .= ' LINES ' . $lines_options_str;
}
+
+ return $ret;
}
}
diff --git a/src/Components/Key.php b/src/Components/Key.php
index bc71f4d..bd3bbd1 100644
--- a/src/Components/Key.php
+++ b/src/Components/Key.php
@@ -6,8 +6,8 @@
namespace PhpMyAdmin\SqlParser\Components;
-use PhpMyAdmin\SqlParser\Context;
use PhpMyAdmin\SqlParser\Component;
+use PhpMyAdmin\SqlParser\Context;
use PhpMyAdmin\SqlParser\Parser;
use PhpMyAdmin\SqlParser\Token;
use PhpMyAdmin\SqlParser\TokensList;
diff --git a/src/Components/OrderKeyword.php b/src/Components/OrderKeyword.php
index 8e628f0..77d5a3d 100644
--- a/src/Components/OrderKeyword.php
+++ b/src/Components/OrderKeyword.php
@@ -133,8 +133,8 @@ class OrderKeyword extends Component
{
if (is_array($component)) {
return implode(', ', $component);
- } else {
- return $component->expr . ' ' . $component->type;
}
+
+ return $component->expr . ' ' . $component->type;
}
}
diff --git a/src/Components/ParameterDefinition.php b/src/Components/ParameterDefinition.php
index 1f3c929..1a9ee54 100644
--- a/src/Components/ParameterDefinition.php
+++ b/src/Components/ParameterDefinition.php
@@ -6,8 +6,8 @@
namespace PhpMyAdmin\SqlParser\Components;
-use PhpMyAdmin\SqlParser\Context;
use PhpMyAdmin\SqlParser\Component;
+use PhpMyAdmin\SqlParser\Context;
use PhpMyAdmin\SqlParser\Parser;
use PhpMyAdmin\SqlParser\Token;
use PhpMyAdmin\SqlParser\TokensList;
@@ -143,15 +143,15 @@ class ParameterDefinition extends Component
{
if (is_array($component)) {
return '(' . implode(', ', $component) . ')';
- } else {
- $tmp = '';
- if (!empty($component->inOut)) {
- $tmp .= $component->inOut . ' ';
- }
+ }
- return trim(
- $tmp . Context::escape($component->name) . ' ' . $component->type
- );
+ $tmp = '';
+ if (!empty($component->inOut)) {
+ $tmp .= $component->inOut . ' ';
}
+
+ return trim(
+ $tmp . Context::escape($component->name) . ' ' . $component->type
+ );
}
}
diff --git a/src/Components/PartitionDefinition.php b/src/Components/PartitionDefinition.php
index 3e3c1d8..59b34cb 100644
--- a/src/Components/PartitionDefinition.php
+++ b/src/Components/PartitionDefinition.php
@@ -203,19 +203,18 @@ class PartitionDefinition extends Component
{
if (is_array($component)) {
return "(\n" . implode(",\n", $component) . "\n)";
- } else {
- if ($component->isSubpartition) {
- return trim('SUBPARTITION ' . $component->name . ' ' . $component->options);
- } else {
- $subpartitions = empty($component->subpartitions)
- ? '' : ' ' . self::build($component->subpartitions);
-
- return trim(
- 'PARTITION ' . $component->name
- . (empty($component->type) ? '' : ' VALUES ' . $component->type . ' ' . $component->expr . ' ')
- . $component->options . $subpartitions
- );
- }
}
+
+ if ($component->isSubpartition) {
+ return trim('SUBPARTITION ' . $component->name . ' ' . $component->options);
+ }
+
+ $subpartitions = empty($component->subpartitions) ? '' : ' ' . self::build($component->subpartitions);
+
+ return trim(
+ 'PARTITION ' . $component->name
+ . (empty($component->type) ? '' : ' VALUES ' . $component->type . ' ' . $component->expr . ' ')
+ . $component->options . $subpartitions
+ );
}
}
diff --git a/src/Components/Reference.php b/src/Components/Reference.php
index 0f708fe..798eb68 100644
--- a/src/Components/Reference.php
+++ b/src/Components/Reference.php
@@ -6,8 +6,8 @@
namespace PhpMyAdmin\SqlParser\Components;
-use PhpMyAdmin\SqlParser\Context;
use PhpMyAdmin\SqlParser\Component;
+use PhpMyAdmin\SqlParser\Context;
use PhpMyAdmin\SqlParser\Parser;
use PhpMyAdmin\SqlParser\Token;
use PhpMyAdmin\SqlParser\TokensList;
diff --git a/src/Components/RenameOperation.php b/src/Components/RenameOperation.php
index 8ec8647..6405cb4 100644
--- a/src/Components/RenameOperation.php
+++ b/src/Components/RenameOperation.php
@@ -163,8 +163,8 @@ class RenameOperation extends Component
{
if (is_array($component)) {
return implode(', ', $component);
- } else {
- return $component->old . ' TO ' . $component->new;
}
+
+ return $component->old . ' TO ' . $component->new;
}
}
diff --git a/src/Components/SetOperation.php b/src/Components/SetOperation.php
index 087ff6a..364165a 100644
--- a/src/Components/SetOperation.php
+++ b/src/Components/SetOperation.php
@@ -128,8 +128,8 @@ class SetOperation extends Component
{
if (is_array($component)) {
return implode(', ', $component);
- } else {
- return $component->column . ' = ' . $component->value;
}
+
+ return $component->column . ' = ' . $component->value;
}
}
generated by cgit v1.1 at 2025-05-12 21:13:54 +0000