Skip to content

Commit 8fcef27

Browse files
committed
Update LOAD DATA concatenations
1 parent 30b628b commit 8fcef27

1 file changed

Lines changed: 22 additions & 27 deletions

File tree

src/Manipulation/LoadData.php

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -172,26 +172,20 @@ protected function renderColumns() : ?string
172172
&& ! isset($this->sql['columns_escaped_by'])) {
173173
return null;
174174
}
175-
return ' COLUMNS' . \PHP_EOL
176-
. (
177-
isset($this->sql['columns_terminated_by'])
178-
? " TERMINATED BY {$this->sql['columns_terminated_by']}" . \PHP_EOL
179-
: ''
180-
)
181-
. (
182-
isset($this->sql['columns_enclosed_by'])
183-
? (
184-
isset($this->sql['columns_enclosed_by_opt'])
185-
? ' OPTIONALLY'
186-
: ' '
187-
) . " ENCLOSED BY {$this->sql['columns_enclosed_by']}" . \PHP_EOL
188-
: ''
189-
)
190-
. (
191-
isset($this->sql['columns_escaped_by'])
192-
? " ESCAPED BY {$this->sql['columns_escaped_by']}" . \PHP_EOL
193-
: ''
194-
);
175+
$part = ' COLUMNS' . \PHP_EOL;
176+
if (isset($this->sql['columns_terminated_by'])) {
177+
$part .= ' TERMINATED BY ' . $this->sql['columns_terminated_by'] . \PHP_EOL;
178+
}
179+
if (isset($this->sql['columns_enclosed_by'])) {
180+
if (isset($this->sql['columns_enclosed_by_opt'])) {
181+
$part .= ' OPTIONALLY';
182+
}
183+
$part .= ' ENCLOSED BY ' . $this->sql['columns_enclosed_by'] . \PHP_EOL;
184+
}
185+
if (isset($this->sql['columns_escaped_by'])) {
186+
$part .= ' ESCAPED BY ' . $this->sql['columns_escaped_by'] . \PHP_EOL;
187+
}
188+
return $part;
195189
}
196190

197191
/**
@@ -222,13 +216,14 @@ protected function renderLines() : ?string
222216
&& ! isset($this->sql['lines_terminated_by'])) {
223217
return null;
224218
}
225-
return ' LINES' . \PHP_EOL
226-
. (isset($this->sql['lines_starting_by'])
227-
? " STARTING BY {$this->sql['lines_starting_by']}" . \PHP_EOL
228-
: '')
229-
. (isset($this->sql['lines_terminated_by'])
230-
? " TERMINATED BY {$this->sql['lines_terminated_by']}" . \PHP_EOL
231-
: '');
219+
$part = ' LINES' . \PHP_EOL;
220+
if (isset($this->sql['lines_starting_by'])) {
221+
$part .= ' STARTING BY ' . $this->sql['lines_starting_by'] . \PHP_EOL;
222+
}
223+
if (isset($this->sql['lines_terminated_by'])) {
224+
$part .= ' TERMINATED BY ' . $this->sql['lines_terminated_by'] . \PHP_EOL;
225+
}
226+
return $part;
232227
}
233228

234229
/**

0 commit comments

Comments
 (0)