Dep: update

주로 PHAN
This commit is contained in:
2021-08-06 22:39:09 +09:00
parent 404cd24855
commit 21e7a4d966
1098 changed files with 92137 additions and 33228 deletions
+11 -6
View File
@@ -2,9 +2,9 @@
/*!
* Medoo database framework
* https://medoo.in
* Version 1.7.8
* Version 1.7.10
*
* Copyright 2019, Angel Lai
* Copyright 2020, Angel Lai
* Released under the MIT license
*/
@@ -445,15 +445,20 @@ class Medoo
}
$query = preg_replace_callback(
'/((FROM|TABLE|INTO|UPDATE)\s*)?\<([a-zA-Z0-9_\.]+)\>/i',
'/(([`\']).*?)?((FROM|TABLE|INTO|UPDATE|JOIN)\s*)?\<(([a-zA-Z0-9_]+)(\.[a-zA-Z0-9_]+)?)\>(.*?\2)?/i',
function ($matches)
{
if (!empty($matches[ 2 ]))
if (!empty($matches[ 2 ]) && isset($matches[ 8 ]))
{
return $matches[ 2 ] . ' ' . $this->tableQuote($matches[ 3 ]);
return $matches[ 0 ];
}
return $this->columnQuote($matches[ 3 ]);
if (!empty($matches[ 4 ]))
{
return $matches[ 1 ] . $matches[ 4 ] . ' ' . $this->tableQuote($matches[ 5 ]);
}
return $matches[ 1 ] . $this->columnQuote($matches[ 5 ]);
},
$raw->value);