-
flip111 authored
1. combine the regexes into one. The only thing that needs to be captured is the alias. Used a non-capturing group for "AS " to avoid confusion and have cleaner regex. It tries to match "Table.Column Alias" or "Table.Column AS Alias". (line 861) 2. No fallback on line 865 like "$column['table'] . '.' . $column['column']" this wouldn't make sense as this can not be possible when it's a wrapped query. Better not insert some random SQL that's gonna confuse the hell out of everybody. 3. Removed "($column['hasTable'] ? $column['table'] . '.' : '') . $column['column']" because the original regex always tries to match the table name. Therefor hasTable will always be true or the entire function fails anyway. (this references line 868 now) (this was unit tested on mysql, postgresql and sql server and did not increase errors/failures)
75048b21
Name |
Last commit
|
Last update |
---|---|---|
bin | ||
docs | ||
lib | ||
tests | ||
.gitattributes | ||
.gitignore | ||
.gitmodules | ||
.travis.yml | ||
LICENSE | ||
README.md | ||
UPGRADE | ||
build.properties | ||
build.xml | ||
composer.json | ||
composer.lock | ||
phpunit.xml.dist | ||
run-all.sh |