mirror of
https://github.com/lkddi/nexusphp.git
synced 2026-04-24 12:07:23 +08:00
last_query() default return json string
This commit is contained in:
@@ -617,9 +617,9 @@ function fail(...$args)
|
|||||||
return api($ret, $msg, $data);
|
return api($ret, $msg, $data);
|
||||||
}
|
}
|
||||||
|
|
||||||
function last_query($all = false)
|
function last_query($all = false, $format = 'json')
|
||||||
{
|
{
|
||||||
static $connection, $pdo;
|
static $connection;
|
||||||
if (is_null($connection)) {
|
if (is_null($connection)) {
|
||||||
if (IN_NEXUS) {
|
if (IN_NEXUS) {
|
||||||
$connection = \Illuminate\Database\Capsule\Manager::connection(\Nexus\Database\NexusDB::ELOQUENT_CONNECTION_NAME);
|
$connection = \Illuminate\Database\Capsule\Manager::connection(\Nexus\Database\NexusDB::ELOQUENT_CONNECTION_NAME);
|
||||||
@@ -634,7 +634,14 @@ function last_query($all = false)
|
|||||||
if ($all) {
|
if ($all) {
|
||||||
return $queries;
|
return $queries;
|
||||||
}
|
}
|
||||||
return isset($queries[0]) ? last($queries) : '';
|
if (empty($queries)) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
$last = last($queries);
|
||||||
|
if ($format === 'json') {
|
||||||
|
return nexus_json_encode($last);
|
||||||
|
}
|
||||||
|
return $last;
|
||||||
}
|
}
|
||||||
|
|
||||||
function format_datetime($datetime, $format = 'Y-m-d H:i')
|
function format_datetime($datetime, $format = 'Y-m-d H:i')
|
||||||
|
|||||||
@@ -379,12 +379,6 @@ class Update extends Install
|
|||||||
TrackerUrl::saveUrlCache();
|
TrackerUrl::saveUrlCache();
|
||||||
NexusDB::cache_del("nexus_plugin_store_all");
|
NexusDB::cache_del("nexus_plugin_store_all");
|
||||||
}
|
}
|
||||||
/**
|
|
||||||
* @since 1.9.7
|
|
||||||
*/
|
|
||||||
if (env("CLICKHOUSE_HOST")) {
|
|
||||||
Artisan::call("clickhouse:migrate");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function runExtraMigrate()
|
public function runExtraMigrate()
|
||||||
|
|||||||
Reference in New Issue
Block a user