Merge branch 'develop' of github.com:sunaoka/laravel-postgres-extenti…

…on into develop

README.md

@@ -3,7 +3,7 @@
 ## Installation
 
 ```bash
-composer require sunaoka/laravel-postgres-extention
+composer require sunaoka/laravel-postgres-extension
 ```
 
 ## Features

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "sunaoka/laravel-postgres-extention",
+    "name": "sunaoka/laravel-postgres-extension",
     "description": "Extended PostgreSQL driver for Laravel.",
     "keywords": ["laravel", "PostgreSQL", "Eloquent", "Model", "driver"],
     "type": "library",
@@ -12,6 +12,7 @@
     ],
     "require": {
         "php": "^7.3",
+        "ext-json": "*",
         "illuminate/database": "^8.0"
     },
     "require-dev": {
@@ -37,6 +38,8 @@
         }
     },
     "config": {
+        "optimize-autoloader": true,
+        "preferred-install": "dist",
         "sort-packages": true
     },
     "minimum-stability": "dev",

config/postgres-extension.php

@@ -0,0 +1,6 @@
+<?php
+
+return [
+    'json_encode_options'        => JSON_UNESCAPED_UNICODE | JSON_PRESERVE_ZERO_FRACTION,
+    'information_schema_caching' => true,
+];

src/Eloquent/Casts/RangeCast.php

@@ -41,24 +41,10 @@ public function get($model, string $key, $value, array $attributes)
     public function set($model, string $key, $value, array $attributes)
     {
         return [
-            $key => $this->serialize($value),
+            $key => ($value !== null) ? (string)$value : null,
         ];
     }
 
-    /**
-     * @param Range|null $range
-     *
-     * @return string|null
-     */
-    protected function serialize(?Range $range): ?string
-    {
-        if ($range === null) {
-            return null;
-        }
-
-        return (string)$range;
-    }
-
     /**
      * @param mixed $value
      *

src/Eloquent/Concerns/HasAttributes.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sunaoka\LaravelPostgres\Eloquent\Concerns;
+
+use Illuminate\Support\Facades\Config;
+
+trait HasAttributes
+{
+    /**
+     * Encode the given value as JSON.
+     *
+     * @param  mixed  $value
+     * @return string
+     */
+    protected function asJson($value)
+    {
+        return json_encode($value, Config::get('postgres-extension.json_encode_options'));
+    }
+}

src/Eloquent/Model.php

@@ -6,6 +6,8 @@
 
 class Model extends \Illuminate\Database\Eloquent\Model
 {
+    use Concerns\HasAttributes;
+
     public function newEloquentBuilder($query)
     {
         return new Builder($query);

src/PostgresServiceProvider.php

@@ -16,8 +16,24 @@ class PostgresServiceProvider extends ServiceProvider
      */
     public function register()
     {
+        $this->mergeConfigFrom(
+            __DIR__ . '/../config/postgres-extension.php', 'postgres-extension'
+        );
+
         Connection::resolverFor('pgsql', function ($connection, $database, $prefix, $config) {
             return new PostgresConnection($connection, $database, $prefix, $config);
         });
     }
+
+    /**
+     * Bootstrap any application services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        $this->publishes([
+            __DIR__ . '/../config/postgres-extension.php' => config_path('postgres-extension.php'),
+        ], 'postgres-extension');
+    }
 }

src/Query/Grammars/PostgresGrammar.php

@@ -5,6 +5,8 @@
 namespace Sunaoka\LaravelPostgres\Query\Grammars;
 
 use Illuminate\Database\Query\Builder;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Config;
 
 class PostgresGrammar extends \Illuminate\Database\Query\Grammars\PostgresGrammar
 {
@@ -42,6 +44,28 @@ public function compileUpdate(Builder $query, array $values)
         return trim($sql);
     }
 
+    /**
+     * Prepare the bindings for an update statement.
+     *
+     * @param  array  $bindings
+     * @param  array  $values
+     * @return array
+     */
+    public function prepareBindingsForUpdate(array $bindings, array $values)
+    {
+        $values = collect($values)->map(function ($value, $column) {
+            return is_array($value) || ($this->isJsonSelector($column) && ! $this->isExpression($value))
+                ? json_encode($value, Config::get('postgres-extension.json_encode_options'))
+                : $value;
+        })->all();
+
+        $cleanBindings = Arr::except($bindings, 'select');
+
+        return array_values(
+            array_merge($values, Arr::flatten($cleanBindings))
+        );
+    }
+
     /**
      * Compile a delete statement into SQL.
      *

src/Schema/PostgresBuilder.php

@@ -5,6 +5,7 @@
 namespace Sunaoka\LaravelPostgres\Schema;
 
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Config;
 
 class PostgresBuilder extends \Illuminate\Database\Schema\PostgresBuilder
 {
@@ -16,6 +17,10 @@ class PostgresBuilder extends \Illuminate\Database\Schema\PostgresBuilder
      */
     public function getColumnListing($table)
     {
+        if (Config::get('postgres-extension.information_schema_caching') !== true) {
+            return parent::getColumnListing($table);
+        }
+
         return Cache::rememberForever(
             __METHOD__ . $table,
             function () use ($table) {