pg support

This commit is contained in:
xiaomlove
2026-04-23 01:04:30 +07:00
parent 94a35b81dc
commit dc77ab7b40
9 changed files with 59 additions and 14 deletions
+1
View File
@@ -13,6 +13,7 @@ DB_PORT=3306
DB_DATABASE=nexusphp DB_DATABASE=nexusphp
DB_USERNAME=nexusphp DB_USERNAME=nexusphp
DB_PASSWORD=nexusphp DB_PASSWORD=nexusphp
DB_SCHEMA=public
BROADCAST_DRIVER=log BROADCAST_DRIVER=log
CACHE_DRIVER=redis CACHE_DRIVER=redis
@@ -51,7 +51,7 @@ class UserPasskeyResource extends Resource
->formatStateUsing(fn($state) => username_for_admin($state)) ->formatStateUsing(fn($state) => username_for_admin($state))
->label(__('label.username')) ->label(__('label.username'))
, ,
Tables\Columns\TextColumn::make('AAGUID') Tables\Columns\TextColumn::make('aaguid')
->label("AAGUID") ->label("AAGUID")
, ,
Tables\Columns\TextColumn::make('credential_id') Tables\Columns\TextColumn::make('credential_id')
+4 -3
View File
@@ -9,7 +9,7 @@ class Passkey extends NexusModel
public $timestamps = true; public $timestamps = true;
protected $fillable = [ protected $fillable = [
'id', 'user_id', 'AAGUID', 'credential_id', 'public_key', 'counter', 'id', 'user_id', 'aaguid', 'credential_id', 'public_key', 'counter',
]; ];
public function user() public function user()
@@ -17,8 +17,9 @@ class Passkey extends NexusModel
return $this->belongsTo(User::class, 'user_id'); return $this->belongsTo(User::class, 'user_id');
} }
public function AAGUID() { public function getAaguidFormatted(): string
$guid = $this->AAGUID; {
$guid = $this->aaguid;
return sprintf( return sprintf(
'%s-%s-%s-%s-%s', '%s-%s-%s-%s-%s',
substr($guid, 0, 8), substr($guid, 0, 8),
+22 -6
View File
@@ -269,8 +269,12 @@ class ExamRepository extends BaseRepository
$now = Carbon::now(); $now = Carbon::now();
$query = Exam::query() $query = Exam::query()
->where('status', Exam::STATUS_ENABLED) ->where('status', Exam::STATUS_ENABLED)
->whereRaw("if(begin is not null and end is not null, begin <= '$now' and end >= '$now', duration > 0 or recurring is not null)") ->whereRaw('
; CASE
WHEN begin IS NOT NULL AND "end" IS NOT NULL
THEN begin <= ? AND "end" >= ?
ELSE duration > 0 OR recurring IS NOT NULL
END', [$now, $now]);
if (!is_null($excludeId)) { if (!is_null($excludeId)) {
$query->whereNotIn('id', Arr::wrap($excludeId)); $query->whereNotIn('id', Arr::wrap($excludeId));
@@ -1139,10 +1143,22 @@ class ExamRepository extends BaseRepository
->orderBy("$examUserTable.id", "asc"); ->orderBy("$examUserTable.id", "asc");
if (!$ignoreTimeRange) { if (!$ignoreTimeRange) {
$whenThens = []; $whenThens = [];
$whenThens[] = "when $examUserTable.`end` is not null then $examUserTable.`end` < '$now'"; $params = [];
$whenThens[] = "when $examTable.`end` is not null then $examTable.`end` < '$now'";
$whenThens[] = "when $examTable.duration > 0 then date_add($examUserTable.created_at, interval $examTable.duration day) < '$now'"; $whenThens[] = "WHEN $examUserTable.\"end\" IS NOT NULL THEN $examUserTable.\"end\" < ?";
$baseQuery->whereRaw(sprintf("case %s else false end", implode(" ", $whenThens))); $params[] = $now;
$whenThens[] = "WHEN $examTable.\"end\" IS NOT NULL THEN $examTable.\"end\" < ?";
$params[] = $now;
if (NexusDB::isMysql()) {
$whenThens[] = "when $examTable.duration > 0 then date_add($examUserTable.created_at, interval $examTable.duration day) < ?";
} elseif (NexusDB::isPgsql()) {
$whenThens[] = "WHEN $examTable.duration > 0 THEN ($examUserTable.created_at + ($examTable.duration || ' day')::INTERVAL) < ?";
}
$params[] = $now;
$baseQuery->whereRaw(sprintf("CASE %s ELSE false END", implode(" ", $whenThens)), $params);
} }
$size = 1000; $size = 1000;
+1 -1
View File
@@ -219,7 +219,7 @@ class UserPasskeyRepository extends BaseRepository
<td> <td>
<div style="display:flex;align-items:center;padding:4px"> <div style="display:flex;align-items:center;padding:4px">
<?php <?php
$meta = $AAGUIDS[$passkey->AAGUID()]; $meta = $AAGUIDS[$passkey->getAaguidFormatted()];
if (isset($meta)) { if (isset($meta)) {
printf('<img style="width: 32px" src="%s" alt="%s" /><div style="margin-right:4px"><b>%s</b> (%s)', $meta['icon_dark'], $meta['name'], $meta['name'], $passkey->credential_id); printf('<img style="width: 32px" src="%s" alt="%s" /><div style="margin-right:4px"><b>%s</b> (%s)', $meta['icon_dark'], $meta['name'], $meta['name'], $passkey->credential_id);
} else { } else {
+1 -1
View File
@@ -74,7 +74,7 @@ return [
'charset' => 'utf8', 'charset' => 'utf8',
'prefix' => '', 'prefix' => '',
'prefix_indexes' => true, 'prefix_indexes' => true,
'schema' => 'public', 'schema' => env('DB_SCHEMA', 'public'),
'sslmode' => 'prefer', 'sslmode' => 'prefer',
], ],
+1 -1
View File
@@ -41,7 +41,7 @@ return [
'charset' => 'utf8', 'charset' => 'utf8',
'prefix' => '', 'prefix' => '',
'prefix_indexes' => true, 'prefix_indexes' => true,
'schema' => 'public', 'schema' => nexus_env('DB_SCHEMA', 'public'),
'sslmode' => 'prefer', 'sslmode' => 'prefer',
], ],
], ],
@@ -0,0 +1,27 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
// 1. 字段名改为小写
Schema::table('user_passkeys', function (Blueprint $table) {
$table->renameColumn('AAGUID', 'aaguid');
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
//
}
};
+1 -1
View File
@@ -245,7 +245,7 @@ $subject = $lang_messages['text_no_subject'];
} }
// Mark message unread // Mark message unread
sql_query("UPDATE messages SET unread='no' WHERE id=" . sqlesc($pm_id) . " AND receiver=" . sqlesc($CURUSER['id']) . " LIMIT 1"); sql_query("UPDATE messages SET unread='no' WHERE id=" . sqlesc($pm_id) . " AND receiver=" . sqlesc($CURUSER['id']));
$Cache->delete_value('user_'.$CURUSER['id'].'_unread_message_count'); $Cache->delete_value('user_'.$CURUSER['id'].'_unread_message_count');
// Display message // Display message
stdhead("PM ($subject)"); ?> stdhead("PM ($subject)"); ?>