Add cached granulation of tables and more explicit variable names

Author: xBu3n0

README.md

@@ -57,8 +57,9 @@ return [
             'database' => env('DB_DATABASE', 'mydatabase'),
             'username' => env('DB_USERNAME', 'user'),
             'password' => env('DB_PASSWORD', 'password'),
-            'charset' => 'utf8', // Experimental yet, prefer use the `DB_CHARSET` and `APPLICATION_CHARSET`
+            '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])
         ],
 
         ...
@@ -96,19 +97,19 @@ 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 `DB_CHARSET` and `APPLICATION_CHARSET` in `.env` file, see the following example:
+To configure the charset between the database and the application, add the fields `DATABASE_CHARSET` and `APPLICATION_CHARSET` in `.env` file, see the following example:
 
 ```env
-DB_CHARSET=CP850
+DATABASE_CHARSET=CP850
 APPLICATION_CHARSET=UTF8
 ```
 ## 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_COLUMNS` and `SYBASE_CACHE_COLUMNS_TIME` to the `.env` file, see the following example:
+To use the cache, add the fields `SYBASE_CACHE_TABLES` and `SYBASE_CACHE_TABLES_TIME` to the `.env` file, see the following example:
 ```dotenv
-SYBASE_CACHE_COLUMNS=true
-SYBASE_CACHE_COLUMNS_TIME=3600 # cache table information by `3600` seconds
+SYBASE_CACHE_TABLES=true
+SYBASE_CACHE_TABLES_TIME=3600 # cache table information by `3600` seconds
 ```
 
 ## Setting to use numeric data type

src/Database/Connection.php

@@ -147,7 +147,9 @@ private function compile(Builder $builder)
             }
         }
 
-        $cache_columns = env('SYBASE_CACHE_COLUMNS');
+        $cache_tables = env('SYBASE_CACHE_TABLES');
+        $cache = !key_exists('cache_tables', $builder->connection->config) || $builder->connection->config['cache_tables'];
+
         $types = [];
 
         foreach ($arrTables as $tables) {
@@ -163,8 +165,8 @@ private function compile(Builder $builder)
                 $tables = $alias['table'];
             }
 
-            if($cache_columns == true) {
-                $aux = Cache::remember('sybase_columns/'.$tables.'.columns_info', env('SYBASE_CACHE_COLUMNS_TIME') ?? 600, function() use($tables) {
+            if($cache_tables && $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);
                     return $queryRes->fetchAll(PDO::FETCH_NAMED);
@@ -359,7 +361,7 @@ private function compileNewQuery($query, $bindings)
         $newQuery = join(array_map(fn($k1, $k2) => $k1.$k2, $partQuery, $bindings));
         $newQuery = str_replace('[]', '', $newQuery);
 
-        $db_charset = env('DB_CHARSET');
+        $db_charset = env('DATABASE_CHARSET');
         $app_charset = env('APPLICATION_CHARSET');
 
         if($db_charset && $app_charset) {
@@ -395,7 +397,7 @@ public function select($query, $bindings = [], $useReadPdo = true)
 
             $result = $statement->fetchAll($this->getFetchMode());
 
-            $db_charset = env('DB_CHARSET');
+            $db_charset = env('DATABASE_CHARSET');
             $app_charset = env('APPLICATION_CHARSET');
 
             if($db_charset && $app_charset) {