summaryrefslogtreecommitdiffstats
path: root/src/Components/CreateDefinition.php
diff options
context:
space:
mode:
Diffstat (limited to 'src/Components/CreateDefinition.php')
-rw-r--r--src/Components/CreateDefinition.php55
1 files changed, 28 insertions, 27 deletions
diff --git a/src/Components/CreateDefinition.php b/src/Components/CreateDefinition.php
index 8a06006..0b5c584 100644
--- a/src/Components/CreateDefinition.php
+++ b/src/Components/CreateDefinition.php
@@ -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);
}
}