Merge pull request #98 from andrex47/master

removed filter for list of table columns

Author: andrex47

Diff for: src/Database/Connection.php

@@ -7,7 +7,6 @@
 use Exception;
 use Illuminate\Database\Connection as IlluminateConnection;
 use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Schema;
 use PDO;
 use Uepg\LaravelSybase\Database\Query\Grammar as QueryGrammar;
@@ -164,10 +163,11 @@ private function compile(Builder $builder)
             }
 
             if ($cache) {
-                $cacheTime = key_exists('cache_time',$builder->connection->config) ? $builder->connection->config['cache_time'] : 3600;
+                $cacheTime = key_exists('cache_time', $builder->connection->config) ? $builder->connection->config['cache_time'] : 3600;
                 $aux = cache()->remember("sybase_columns.$tables.columns_info", $cacheTime, function () use ($tables) {
                     $queryString = $this->queryString($tables);
                     $queryRes = $this->getPdo()->query($queryString);
+
                     return $queryRes->fetchAll(PDO::FETCH_NAMED);
                 });
             } else {
@@ -270,23 +270,18 @@ private function queryString($tables)
             JOIN
                 {$explicitDB[0]}..systypes as systypes noholdlock ON systypes.usertype = syscolumns.usertype
             WHERE
-                systypes.name NOT IN ('timestamp', 'sysname', 'longsysname', 'nchar', 'nvarchar')
-                AND systypes.usertype < 100
-                AND object_name(syscolumns.id, db_id('{$explicitDB[0]}')) = '{$explicitDB[1]}'
+                object_name(syscolumns.id, db_id('{$explicitDB[0]}')) = '{$explicitDB[1]}'
             SQL;
         } else {
             return <<<SQL
                     SELECT
                 syscolumns.name,
                 systypes.name AS type
             FROM
-                syscolumns
+                syscolumns noholdlock
             JOIN
-                systypes ON systypes.usertype = syscolumns.usertype
-            WHERE
-                systypes.name NOT IN ('timestamp', 'sysname', 'longsysname', 'nchar', 'nvarchar')
-                AND systypes.usertype < 100
-            AND object_name(syscolumns.id) = '{$tables}'
+                systypes noholdlock ON systypes.usertype = syscolumns.usertype
+            WHERE object_name(syscolumns.id) = '{$tables}'
             SQL;
         }
     }
@@ -341,7 +336,7 @@ private function compileNewQuery($query, $bindings)
         $newQuery = join(array_map(fn ($k1, $k2) => $k1.$k2, $partQuery, $bindings));
         $newQuery = str_replace('[]', '', $newQuery);
         $application_encoding = config('database.sybase.application_encoding');
-        if (is_null($application_encoding)) {
+        if (is_null($application_encoding) || $application_encoding == false) {
             return $newQuery;
         }
         $database_charset = config('database.sybase.database_charset');
@@ -391,7 +386,7 @@ public function select($query, $bindings = [], $useReadPdo = true)
             $result = [...$result];
 
             $application_encoding = config('database.sybase.application_encoding');
-            if (is_null($application_encoding)) {
+            if (is_null($application_encoding) || $application_encoding == false) {
                 return $result;
             }
             $database_charset = config('database.sybase.database_charset');