update columns

Author: taylorotwell

src/Illuminate/Cache/DatabaseLock.php

@@ -59,27 +59,27 @@ public function acquire()
 
         try {
             $this->connection->table($this->table)->insert([
-                'id' => $this->name,
+                'key' => $this->name,
                 'owner' => $this->owner,
-                'expires_at' => $this->expiresAt(),
+                'expiration' => $this->expiresAt(),
             ]);
 
             $acquired = true;
         } catch (QueryException $e) {
             $updated = $this->connection->table($this->table)
-                ->where('id', $this->name)
+                ->where('key', $this->name)
                 ->where(function ($query) {
-                    return $query->where('owner', $this->owner)->orWhere('expires_at', '<=', time());
+                    return $query->where('owner', $this->owner)->orWhere('expiration', '<=', time());
                 })->update([
                     'owner' => $this->owner,
-                    'expires_at' => $this->expiresAt(),
+                    'expiration' => $this->expiresAt(),
                 ]);
 
             $acquired = $updated >= 1;
         }
 
         if (random_int(1, $this->lottery[1]) <= $this->lottery[0]) {
-            $this->connection->table($this->table)->where('expires_at', '<=', time())->delete();
+            $this->connection->table($this->table)->where('expiration', '<=', time())->delete();
         }
 
         return $acquired;
@@ -104,7 +104,7 @@ public function release()
     {
         if ($this->isOwnedByCurrentProcess()) {
             $this->connection->table($this->table)
-                        ->where('id', $this->name)
+                        ->where('key', $this->name)
                         ->where('owner', $this->owner)
                         ->delete();
 
@@ -122,7 +122,7 @@ public function release()
     public function forceRelease()
     {
         $this->connection->table($this->table)
-                    ->where('id', $this->name)
+                    ->where('key', $this->name)
                     ->delete();
     }
 
@@ -133,6 +133,6 @@ public function forceRelease()
      */
     protected function getCurrentOwner()
     {
-        return optional($this->connection->table($this->table)->where('id', $this->name)->first())->owner;
+        return optional($this->connection->table($this->table)->where('key', $this->name)->first())->owner;
     }
 }

tests/Integration/Database/DatabaseLockTest.php

@@ -17,9 +17,9 @@ protected function setUp(): void
         parent::setUp();
 
         Schema::create('cache_locks', function (Blueprint $table) {
-            $table->string('id')->primary();
+            $table->string('key')->primary();
             $table->string('owner');
-            $table->integer('expires_at');
+            $table->integer('expiration');
         });
     }
 
@@ -55,7 +55,7 @@ public function testExpiredLockCanBeRetrieved()
     {
         $lock = Cache::driver('database')->lock('foo');
         $this->assertTrue($lock->get());
-        DB::table('cache_locks')->update(['expires_at' => now()->subDays(1)->getTimestamp()]);
+        DB::table('cache_locks')->update(['expiration' => now()->subDays(1)->getTimestamp()]);
 
         $otherLock = Cache::driver('database')->lock('foo');
         $this->assertTrue($otherLock->get());