Merge pull request #3 from pnlinh/fix/wrong-format

Fix wrong origin sql format

Author: pnlinh

docker-compose.yml

@@ -0,0 +1,9 @@
+version: '2'
+
+services:
+  app:
+    image: shinsenter/laravel:php8.0
+    volumes:
+      - ./:/var/www/html
+    networks:
+      - localnet

src/QueryLoggerServiceProvider.php

@@ -72,10 +72,12 @@ protected function writeMySqlLog(QueryExecuted $query, LogManager $logger)
             }
         }
 
+        $tempStr = sprintf('@%s@', date('Y'));
+
         $sql = $query->sql;
-        $sql = str_replace(['%', '?'], ['**', '"%s"'], $sql);
+        $sql = str_replace(['%', '?'], [$tempStr, '"%s"'], $sql);
         $sql = vsprintf(str_replace('?', '"%s"', $sql), $query->bindings);
-        $sql = str_replace('**', '%', $sql);
+        $sql = str_replace($tempStr, '%', $sql);
 
         $messages = [
             '[SQL]',

tests/Feature/QueryLoggerServiceProviderTest.php

@@ -18,14 +18,28 @@ public function it_can_be_constructed()
     /** @test */
     public function it_can_be_write_log()
     {
-        User::create(['email' => '[email protected]']);
+        User::query()->create(['email' => '[email protected]']);
 
         $path = storage_path('logs/laravel.log');
         $logContent = file_get_contents($path);
 
         $this->assertFileExists($path);
         $this->assertNotEmpty($logContent);
     }
+
+    /** @test */
+    public function it_must_match_origin_query()
+    {
+        $phone = '60********85';
+
+        User::query()->where('phone', $phone)->first();
+
+        $path = storage_path('logs/laravel.log');
+        $logContent = file_get_contents($path);
+
+        $this->assertNotEmpty($logContent);
+        $this->assertStringContainsString($phone, $logContent);
+    }
 }
 
 class User extends Model
@@ -37,5 +51,5 @@ class User extends Model
     public $timestamps = false;
 
     /** @var string[] */
-    protected $fillable = ['email'];
+    protected $fillable = ['email', 'phone'];
 }

tests/TestCase.php

@@ -22,18 +22,20 @@ public function getPackageProviders($app): array
 
     public function getEnvironmentSetUp($app)
     {
-        config()->set('database.default', 'sqlite');
-        config()->set('database.connections.sqlite', [
+        $app['config']->set('database.default', 'sqlite');
+        $app['config']->set('database.connections.sqlite', [
             'driver'   => 'sqlite',
             'database' => ':memory:',
             'prefix'   => '',
         ]);
-        config()->set('app.debug', true);
-        config()->set('app.logging.default', 'single');
+        $app['config']->set('app.debug', true);
+        $app['config']->set('app.logging.default', 'single');
 
         Schema::create('users', function (Blueprint $table) {
             $table->increments('id');
-            $table->string('email')->nullable();
+            $table->string('email')->unique();
+            $table->string('phone')->nullable();
+            $table->timestamps();
         });
     }
 }