Helpers::loadFromFile improved

Author: dg

src/Database/Helpers.php

@@ -192,22 +192,21 @@ public static function loadFromFile(Connection $connection, $file): int
 		$delimiter = ';';
 		$sql = '';
 		$pdo = $connection->getPdo(); // native query without logging
-		while (!feof($handle)) {
-			$s = rtrim((string) fgets($handle));
+		while (($s = fgets($handle)) !== FALSE) {
 			if (!strncasecmp($s, 'DELIMITER ', 10)) {
-				$delimiter = substr($s, 10);
+				$delimiter = trim(substr($s, 10));
 
-			} elseif (substr($s, -strlen($delimiter)) === $delimiter) {
-				$sql .= substr($s, 0, -strlen($delimiter));
+			} elseif (substr($ts = rtrim($s), -strlen($delimiter)) === $delimiter) {
+				$sql .= substr($ts, 0, -strlen($delimiter));
 				$pdo->exec($sql);
 				$sql = '';
 				$count++;
 
 			} else {
-				$sql .= $s . "\n";
+				$sql .= $s;
 			}
 		}
-		if (trim($sql) !== '') {
+		if (rtrim($sql) !== '') {
 			$pdo->exec($sql);
 			$count++;
 		}