From 40fa69932b9487325325c8af9650b656d5ac8998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Sat, 17 Aug 2019 14:11:49 +0200 Subject: [PATCH 1/2] [1.7.0] Fix Redis scan (#97) * Fix Redis scan * Fix keys issue --- src/StorageDrivers/RedisStorageDriver.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/StorageDrivers/RedisStorageDriver.php b/src/StorageDrivers/RedisStorageDriver.php index 9866018c..b2e4ab44 100644 --- a/src/StorageDrivers/RedisStorageDriver.php +++ b/src/StorageDrivers/RedisStorageDriver.php @@ -86,11 +86,10 @@ class RedisStorageDriver implements StorageDriver if (config('database.redis.client') === 'phpredis') { $redis_prefix = $this->redis->getOption($this->redis->client()::OPT_PREFIX) ?? $redis_prefix; - $all_keys = $this->redis->scan(null, $redis_prefix . 'tenants:*'); - } else { - $all_keys = $this->redis->scan(null, 'MATCH', $redis_prefix . 'tenants:*')[1]; } + $all_keys = $this->redis->keys('tenants:*'); + $hashes = \array_map(function ($key) use ($redis_prefix) { // Left strip $redis_prefix from $key return \substr($key, \strlen($redis_prefix)); From 8d92d7481ee696260c136ef510b173788bde226b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Sat, 17 Aug 2019 14:37:39 +0200 Subject: [PATCH 2/2] Remove default JSON value Fails on MySQL --- assets/migrations/2019_08_08_000000_create_tenants_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/migrations/2019_08_08_000000_create_tenants_table.php b/assets/migrations/2019_08_08_000000_create_tenants_table.php index fc07702e..35158a88 100644 --- a/assets/migrations/2019_08_08_000000_create_tenants_table.php +++ b/assets/migrations/2019_08_08_000000_create_tenants_table.php @@ -19,7 +19,7 @@ class CreateTenantsTable extends Migration // your indexed columns go here - $table->json('data')->default('{}'); + $table->json('data'); }); }