diff --git a/.env b/.env index c35ead99..3f3bd56a 100644 --- a/.env +++ b/.env @@ -13,7 +13,8 @@ DB_PORT=14338 DB_DATABASE=ANAG_MACRO DB_USERNAME=woo DB_PASSWORD=4n4traPe@ -DB_OPTIONS='{"Encrypt": true, "TrustServerCertificate": true, "ConnectionPooling": false}' +DB_ENCRYPT=true +DB_TRUST_SERVER_CERTIFICATE=true #DB_CONNECTION=sqlsrv DB_HOST_SQLSRVTEST=31.3.180.50 diff --git a/config/database.php b/config/database.php index 4206d204..4f388ab0 100755 --- a/config/database.php +++ b/config/database.php @@ -82,8 +82,8 @@ return [ PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), ]) : [], ], - - 'mysql_appoggio' => [ + + 'mysql_appoggio' => [ 'driver' => 'mysql', 'url' => env('DATABASE_URL_MYSQL2'), 'host' => env('DB_HOST_MYSQL1', '127.0.0.1'), @@ -102,8 +102,8 @@ return [ PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), ]) : [], ], - - + + 'pgsql' => [ 'driver' => 'pgsql', 'url' => env('DATABASE_URL'), @@ -130,10 +130,19 @@ return [ 'charset' => 'utf8', 'prefix' => '', 'prefix_indexes' => true, - 'options' => json_decode(env('DB_OPTIONS', '{}'), true), + 'encrypt' => env('DB_ENCRYPT', 'yes'), + 'trust_server_certificate' => env('DB_TRUST_SERVER_CERTIFICATE', 'true'), + 'options' => [ + PDO::ATTR_STRINGIFY_FETCHES => false, + PDO::SQLSRV_ATTR_FETCHES_NUMERIC_TYPE => true, + PDO::ATTR_TIMEOUT => 30, + PDO::SQLSRV_ATTR_QUERY_TIMEOUT => 30, + PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, + PDO::SQLSRV_ATTR_ENCODING => PDO::SQLSRV_ENCODING_UTF8, + ] ], - 'sqlsrv_test' => [ + 'sqlsrv_test' => [ 'driver' => 'sqlsrv', 'url' => env('DATABASE_URL_SQLSRVTEST'), 'host' => env('DB_HOST_SQLSRVTEST', 'localhost'), @@ -191,7 +200,7 @@ return [ 'options' => [ 'cluster' => env('REDIS_CLUSTER', 'redis'), - 'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'), + 'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_database_'), ], 'default' => [