Skip to content

Add multibyte support #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jiripetrzelka wants to merge 1 commit into
base: php-port
Choose a base branch
from
Open

Add multibyte support #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions src/SQLSplitter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,17 +128,17 @@ private static function getStatements(string $query, string $dbType, string $del
$stringChar = null;
continue;
}
if (strtolower($char) == 'd' && $isInComment == false && $isInString == false) {
if (mb_strtolower($char) == 'd' && $isInComment == false && $isInString == false) {
$delimiterResult = self::getDelimiter($index, $query, $dbType);
if ($delimiterResult != null) {
// it's delimiter
list($delimiterSymbol, $delimiterEndIndex) = $delimiterResult;
$query = substr($query, $delimiterEndIndex);
$query = mb_substr($query, $delimiterEndIndex);
return self::getStatements($query, $dbType, $delimiterSymbol);
}
}
if ($char == "$" && $isInComment == false && $isInString == false) {
$queryUntilTagSymbol = substr($query, $index);
$queryUntilTagSymbol = mb_substr($query, $index);
if ($isInTag == false) {
$tagSymbolResult = self::getTag($queryUntilTagSymbol, $dbType);
if ($tagSymbolResult != null) {
Expand All @@ -156,13 +156,13 @@ private static function getStatements(string $query, string $dbType, string $del
}
}
}
if (strlen($delimiter) > 1 && array_key_exists($index + strlen($delimiter) - 1, $charArray)) {
for ($i = $index + 1; $i < $index + strlen($delimiter); $i++) {
if (mb_strlen($delimiter) > 1 && array_key_exists($index + mb_strlen($delimiter) - 1, $charArray)) {
for ($i = $index + 1; $i < $index + mb_strlen($delimiter); $i++) {
$char .= $charArray[$i];
}
}
// it's a query, continue until you get delimiter hit
if (strtolower($char) == strtolower($delimiter) && $isInString == false && $isInComment == false && $isInTag == false) {
if (mb_strtolower($char) == mb_strtolower($delimiter) && $isInString == false && $isInComment == false && $isInTag == false) {
if (! self::isGoDelimiter($dbType, $query, $index)) {
continue;
}
Expand All @@ -188,8 +188,8 @@ private static function getStatements(string $query, string $dbType, string $del
*/
private static function getQueryParts(string $query, int $splittingIndex, string $delimiter)
{
$statement = substr($query, 0, $splittingIndex);
$restOfQuery = substr($query, $splittingIndex + strlen($delimiter));
$statement = mb_substr($query, 0, $splittingIndex);
$restOfQuery = mb_substr($query, $splittingIndex + mb_strlen($delimiter));
if ($statement != null) {
$statement = trim($statement);
}
Expand All @@ -207,23 +207,23 @@ private static function getDelimiter(int $index, string $query, string $dbType)
{
if ($dbType == self::DB_MYSQL) {
$delimiterKeyword = 'delimiter ';
$delimiterLength = strlen($delimiterKeyword);
$parsedQueryAfterIndexOriginal = substr($query, $index);
$indexOfDelimiterKeyword = strpos(strtolower($parsedQueryAfterIndexOriginal), $delimiterKeyword);
$delimiterLength = mb_strlen($delimiterKeyword);
$parsedQueryAfterIndexOriginal = mb_substr($query, $index);
$indexOfDelimiterKeyword = mb_strpos(mb_strtolower($parsedQueryAfterIndexOriginal), $delimiterKeyword);
if ($indexOfDelimiterKeyword === 0) {
$parsedQueryAfterIndex = substr($query, $index);
$indexOfNewLine = strpos($parsedQueryAfterIndex, "\n");
$parsedQueryAfterIndex = mb_substr($query, $index);
$indexOfNewLine = mb_strpos($parsedQueryAfterIndex, "\n");
if ($indexOfNewLine == -1) {
$indexOfNewLine = strlen($query);
$indexOfNewLine = mb_strlen($query);
}
$parsedQueryAfterIndex = substr($parsedQueryAfterIndex, 0, $indexOfNewLine);
$parsedQueryAfterIndex = substr($parsedQueryAfterIndex, $delimiterLength);
$parsedQueryAfterIndex = mb_substr($parsedQueryAfterIndex, 0, $indexOfNewLine);
$parsedQueryAfterIndex = mb_substr($parsedQueryAfterIndex, $delimiterLength);
$delimiterSymbol = trim($parsedQueryAfterIndex);
$delimiterSymbol = self::clearTextUntilComment($delimiterSymbol, $dbType);
if ($delimiterSymbol != null) {
$delimiterSymbol = trim($delimiterSymbol);
$delimiterSymbolEndIndex = strpos($parsedQueryAfterIndexOriginal,
$delimiterSymbol) + $index + strlen($delimiterSymbol);
$delimiterSymbolEndIndex = mb_strpos($parsedQueryAfterIndexOriginal,
$delimiterSymbol) + $index + mb_strlen($delimiterSymbol);

return [$delimiterSymbol, $delimiterSymbolEndIndex];
}
Expand All @@ -244,7 +244,7 @@ private static function getTag(string $query, string $dbType)
if ($dbType == self::DB_PGSQL) {
if (preg_match('/^(\$[a-zA-Z]*\$)/i', $query, $matches) === 1) {
$tagSymbol = trim($matches[0]);
$indexOfCmd = strpos($query, $tagSymbol);
$indexOfCmd = mb_strpos($query, $tagSymbol);

return [$tagSymbol, $indexOfCmd];
}
Expand Down