lkddi/nexusphp
1
0
Fork 0
mirror of https://github.com/lkddi/nexusphp.git synced 2026-05-15 20:47:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

pg support

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
app/Filament/Resources/User/UserPasskeyResource.php
+1 -1
View File
@@ -51,7 +51,7 @@ class UserPasskeyResource extends Resource
->formatStateUsing(fn($state) => username_for_admin($state))
->label(__('label.username'))
,
Tables\Columns\TextColumn::make('AAGUID')
Tables\Columns\TextColumn::make('aaguid')
->label("AAGUID")
,
Tables\Columns\TextColumn::make('credential_id')
app/Models/Passkey.php
+4 -3
View File
@@ -9,7 +9,7 @@ class Passkey extends NexusModel
public $timestamps = true;
protected $fillable = [
'id', 'user_id', 'AAGUID', 'credential_id', 'public_key', 'counter',
'id', 'user_id', 'aaguid', 'credential_id', 'public_key', 'counter',
];
public function user()
@@ -17,8 +17,9 @@ class Passkey extends NexusModel
return $this->belongsTo(User::class, 'user_id');
}
public function AAGUID() {
$guid = $this->AAGUID;
public function getAaguidFormatted(): string
{
$guid = $this->aaguid;
return sprintf(
'%s-%s-%s-%s-%s',
substr($guid, 0, 8),
app/Repositories/ExamRepository.php
+22 -6
View File
@@ -269,8 +269,12 @@ class ExamRepository extends BaseRepository
$now = Carbon::now();
$query = Exam::query()
->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)) {
$query->whereNotIn('id', Arr::wrap($excludeId));
@@ -1139,10 +1143,22 @@ class ExamRepository extends BaseRepository
->orderBy("$examUserTable.id", "asc");
if (!$ignoreTimeRange) {
$whenThens = [];
$whenThens[] = "when $examUserTable.`end` is not null then $examUserTable.`end` < '$now'";
$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'";
$baseQuery->whereRaw(sprintf("case %s else false end", implode(" ", $whenThens)));
$params = [];
$whenThens[] = "WHEN $examUserTable.\"end\" IS NOT NULL THEN $examUserTable.\"end\" < ?";
$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;
app/Repositories/UserPasskeyRepository.php
+1 -1
View File
@@ -219,7 +219,7 @@ class UserPasskeyRepository extends BaseRepository
<td>
<div style="display:flex;align-items:center;padding:4px">
<?php
$meta = $AAGUIDS[$passkey->AAGUID()];
$meta = $AAGUIDS[$passkey->getAaguidFormatted()];
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);
} else {