feat: rollback de referências para uepg/laravel-sybase

Author: andrehanke

src/Database/Connection.php

@@ -65,9 +65,9 @@ public function transaction(Closure $callback, $attempts = 1)
             $this->pdo->exec('COMMIT TRAN');
         }
 
-            // If we catch an exception, we will roll back so nothing gets messed
-            // up in the database. Then we'll re-throw the exception so it can
-            // be handled how the developer sees fit for their applications.
+        // If we catch an exception, we will roll back so nothing gets messed
+        // up in the database. Then we'll re-throw the exception so it can
+        // be handled how the developer sees fit for their applications.
         catch (Exception $e) {
             $this->pdo->exec('ROLLBACK TRAN');
 
@@ -148,12 +148,12 @@ 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 = ! key_exists('cache_tables', $builder->connection->config) || $builder->connection->config['cache_tables'];
 
         $types = [];
 
         foreach ($arrTables as $tables) {
-            preg_match (
+            preg_match(
                 "/(?:(?'table'.*)(?: as )(?'alias'.*))|(?'tables'.*)/",
                 strtolower($tables),
                 $alias
@@ -165,10 +165,11 @@ private function compile(Builder $builder)
                 $tables = $alias['table'];
             }
 
-            if($cache_tables && $cache) {
-                $aux = Cache::remember('sybase_columns/'.$tables.'.columns_info', env('SYBASE_CACHE_TABLES_TIME') ?? 3600, 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);
                 });
             } else {
@@ -191,8 +192,10 @@ private function compile(Builder $builder)
 
         $keys = [];
 
-        $convert = function($column, $v) use($types) {
-            if (is_null($v)) return null;
+        $convert = function ($column, $v) use ($types) {
+            if (is_null($v)) {
+                return null;
+            }
 
             $variable_type = $types[strtolower($column)];
 
@@ -205,7 +208,7 @@ private function compile(Builder $builder)
 
         if (isset($builder->values)) {
             foreach ($builder->values as $key => $value) {
-                if(gettype($value) === 'array') {
+                if (gettype($value) === 'array') {
                     foreach ($value as $k => $v) {
                         $keys[] = $convert($k, $v);
                     }
@@ -233,7 +236,9 @@ private function compile(Builder $builder)
                     }
                 }
             } elseif ($w['type'] == 'between') {
-                if(count($w['values']) != 2) { return []; }
+                if (count($w['values']) != 2) {
+                    return [];
+                }
                 foreach ($w['values'] as $v) {
                     if (gettype($v) !== 'object') {
                         $keys[] = $convert($k, $v);
@@ -316,7 +321,7 @@ private function queryString($tables)
      *
      * @param  string  $query
      * @param  array  $bindings
-     * @return mixed  $newBinds
+     * @return mixed $newBinds
      */
     private function compileBindings($query, $bindings)
     {
@@ -354,17 +359,17 @@ private function compileNewQuery($query, $bindings)
         $bindings = $this->compileBindings($query, $bindings);
         $partQuery = explode('?', $query);
 
-        $bindings = array_map(fn($v) => gettype($v) === 'string' ? str_replace('\'', '\'\'', $v) : $v, $bindings);
-        $bindings = array_map(fn($v) => gettype($v) === 'string' ? "'{$v}'" : $v, $bindings);
-        $bindings = array_map(fn($v) => gettype($v) === 'NULL' ? 'NULL' : $v, $bindings);
+        $bindings = array_map(fn ($v) => gettype($v) === 'string' ? str_replace('\'', '\'\'', $v) : $v, $bindings);
+        $bindings = array_map(fn ($v) => gettype($v) === 'string' ? "'{$v}'" : $v, $bindings);
+        $bindings = array_map(fn ($v) => gettype($v) === 'NULL' ? 'NULL' : $v, $bindings);
 
-        $newQuery = join(array_map(fn($k1, $k2) => $k1.$k2, $partQuery, $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) {
+        if ($db_charset && $app_charset) {
             $newQuery = mb_convert_encoding($newQuery, $db_charset, $app_charset);
         }
 
@@ -402,16 +407,17 @@ public function select($query, $bindings = [], $useReadPdo = true)
                 do {
                     $result += $statement->fetchAll($this->getFetchMode());
                 } while ($statement->nextRowset());
-            } catch (\Exception $e) {}
+            } catch (\Exception $e) {
+            }
 
             $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) {
+            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;
                     }
                 }
@@ -425,7 +431,7 @@ public function select($query, $bindings = [], $useReadPdo = true)
      * Get the statement.
      *
      * @param  string  $query
-     * @param  mixed|array   $bindings
+     * @param  mixed|array  $bindings
      * @return bool
      */
     public function statement($query, $bindings = [])

src/Database/Connector.php

@@ -12,7 +12,7 @@ public function connect(array $config)
 
         $connection = $this->createConnection($this->getDsn($config), $config, $options);
 
-        if(isset($config['charset'])) {
+        if (isset($config['charset'])) {
             $connection->prepare("set char_convert '{$config['charset']}'")->execute();
         }