Merge pull request #96 from andrex47/master

remove env() references

Author: andrex47

README.md

@@ -59,7 +59,8 @@ return [
             'password' => env('DB_PASSWORD', 'password'),
             'charset' => 'utf8',
             'prefix' => '',
-            'cache' => true // By default it caches on all connections, if you want some connection not remembered assign `false` (Recommended when modification is performed on tables frequently [development])
+            'cache_tables' => true,
+            'cache_time' => 3600
         ],
 
         ...
@@ -97,19 +98,30 @@ The file is usualy found in **/etc/freetds/freetds.conf**. Set the configuration
 ```
 
 ## Configuring the charset between the database and the application
-To configure the charset between the database and the application, add the fields `SYBASE_DATABASE_CHARSET` and `SYBASE_APPLICATION_CHARSET` in `.env` file, see the following example:
+This package offers to method to charset conversion, it can be converted in application layer or in database layer, we offered both methods because it can be useful for debugging, to config the application layer conversion you need to set up the following entries on the `database.php` file. You can view an example of the application encoding setup below:
+
+```database
+'sybase' =>
+    [
+        'application_encoding' => true,
+        'application_charset' => '',
+        'sybase_database_charset' => ''
+    ],
+```
 
-```env
-SYBASE_DATABASE_CHARSET=CP850
-SYBASE_APPLICATION_CHARSET=UTF8
+```charset
+     'charset' => 'utf8',
 ```
+
+To use the database layer conversion add the property charset to connection configuration on `database.php`
+
 ## Configuring the cache
 As the library consults table information whenever it receives a request, caching can be used to avoid excessive queries
 
-To use the cache, add the fields `SYBASE_CACHE_TABLES` and `SYBASE_CACHE_TABLES_TIME` to the `.env` file, see the following example:
+To use the cache, add the property `cache_tables` to the database.php connection configuration, you can customize the time of the cache with the property `cache_time` in the same configuration
 ```dotenv
-SYBASE_CACHE_TABLES=true
-SYBASE_CACHE_TABLES_TIME=3600 # cache table information by `3600` seconds
+        'cache_tables' => true,
+        'cache_time' => 3600
 ```
 
 ## Setting to use numeric data type

src/Database/Connection.php

@@ -147,8 +147,7 @@ private function compile(Builder $builder)
             }
         }
 
-        $cache_tables = env('SYBASE_CACHE_TABLES');
-        $cache = ! key_exists('cache_tables', $builder->connection->config) || $builder->connection->config['cache_tables'];
+        $cache = $builder->connection->config['cache_tables'];
 
         $types = [];
 
@@ -165,7 +164,7 @@ private function compile(Builder $builder)
                 $tables = $alias['table'];
             }
 
-            if ($cache_tables && $cache) {
+            if ($cache) {
                 $aux = Cache::remember('sybase_columns/'.$tables.'.columns_info', env('SYBASE_CACHE_TABLES_TIME') ?? 3600, function () use ($tables) {
                     $queryString = $this->queryString($tables);
                     $queryRes = $this->getPdo()->query($queryString);
@@ -342,13 +341,16 @@ private function compileNewQuery($query, $bindings)
 
         $newQuery = join(array_map(fn ($k1, $k2) => $k1.$k2, $partQuery, $bindings));
         $newQuery = str_replace('[]', '', $newQuery);
-
-        $db_charset = env('SYBASE_DATABASE_CHARSET');
-        $app_charset = env('SYBASE_APPLICATION_CHARSET');
-
-        if ($db_charset && $app_charset) {
-            $newQuery = mb_convert_encoding($newQuery, $db_charset, $app_charset);
+        $app_encoding = config('database.sybase.app_encoding');
+        if (! $app_encoding) {
+            return $newQuery;
         }
+        $db_charset = config('database.sybase.db_charset');
+        $app_charset = config('database.sybase.app_charset');
+        if (is_null($db_charset) || is_null($app_charset)) {
+            throw new \Exception('[SYBASE] Database Charset and App Charset not set');
+        }
+        $newQuery = mb_convert_encoding($newQuery, $db_charset, $app_charset);
 
         return $newQuery;
     }
@@ -389,14 +391,18 @@ public function select($query, $bindings = [], $useReadPdo = true)
 
             $result = [...$result];
 
-            $db_charset = env('SYBASE_DATABASE_CHARSET');
-            $app_charset = env('SYBASE_APPLICATION_CHARSET');
-
-            if ($db_charset && $app_charset) {
-                foreach ($result as &$r) {
-                    foreach ($r as $k => &$v) {
-                        $v = gettype($v) === 'string' ? mb_convert_encoding($v, $app_charset, $db_charset) : $v;
-                    }
+            $app_encoding = config('database.sybase.app_encoding');
+            if (! $app_encoding) {
+                return $result;
+            }
+            $db_charset = config('database.sybase.db_charset');
+            $app_charset = config('database.sybase.app_charset');
+            if (is_null($db_charset) || is_null($app_charset)) {
+                throw new \Exception('[SYBASE] Database Charset and App Charset not set');
+            }
+            foreach ($result as &$r) {
+                foreach ($r as $k => &$v) {
+                    $v = gettype($v) === 'string' ? mb_convert_encoding($v, $app_charset, $db_charset) : $v;
                 }
             }