Merge pull request #100 from andrex47/master

fix for running migrations with sybase as default connection

Author: andrex47

README.md

@@ -47,12 +47,6 @@ Update your **config/database.php's** default driver with the settings for the *
 return [
     ...
 
-    'sybase' =>
-        [
-            'application_encoding' => false,
-            'application_charset' => '',
-            'database_charset' => ''
-        ],
 
     'connections' => [
         ...
@@ -67,7 +61,9 @@ return [
             'charset' => 'utf8',
             'prefix' => '',
             'cache_tables' => true,
-            'cache_time' => 3600
+            'cache_time' => 3600,
+             'application_encoding' => false,
+             'application_charset' => '',
         ],
 
         ...
@@ -107,18 +103,13 @@ The file is usualy found in **/etc/freetds/freetds.conf**. Set the configuration
 ## Configuring the charset conversion
 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' => '',
-        'database_charset' => ''
-    ],
 ```
 To use the database layer conversion add the property charset to connection configuration on the sybase configuration array
 
 ```charset
      'charset' => 'utf8',
+     'application_encoding' => false,
+     'application_charset' => '',
 ```
 
 

src/Database/Connection.php

@@ -39,6 +39,54 @@ class Connection extends IlluminateConnection
         'money',
     ];
 
+
+    /**
+     * @var string The application charset
+     */
+    private $applicationCharset;
+
+    /**
+     * @var string The database charset
+     */
+    private $databaseCharset;
+
+    private $applicationEncoding = false;
+
+    /**
+     * Create a new database connection instance.
+     *
+     * @param  \PDO|\Closure  $pdo
+     * @param  string  $database
+     * @param  string  $tablePrefix
+     * @param  array  $config
+     * @return void
+     */
+    public function __construct($pdo, $database = '', $tablePrefix = '', array $config = [])
+    {
+        parent::__construct($pdo, $database, $tablePrefix, $config);
+        $this->configureExtraSettings($config);
+    }
+
+    /**
+     * Configures the encoding for the connection.
+     *
+     * @param array $config
+     * @return void
+     */
+    public function configureExtraSettings($config = [])
+    {
+        $this->applicationEncoding = key_exists('application_encoding',$config) ? $config['application_encoding'] : false;
+        if ($this->applicationEncoding)
+        {
+            if (!key_exists('application_charset',$config,) || !key_exists('database_charset',$config))
+            {
+                throw new \Exception('When application encoding is configured, you need to set up application_charset and database_charset');
+            }
+            $this->applicationCharset = $config['application_charset'];
+            $this->databaseCharset = $config['charset'];
+        }
+    }
+
     /**
      * Execute a Closure within a transaction.
      *
@@ -67,7 +115,7 @@ public function transaction(Closure $callback, $attempts = 1)
         // 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) {
+        catch (\Exception|\PDOException $e) {
             $this->pdo->exec('ROLLBACK TRAN');
 
             throw $e;
@@ -146,7 +194,7 @@ private function compile(Builder $builder)
             }
         }
 
-        $cache = $builder->connection->config['cache_tables'];
+        $cache = key_exists('cache_tables',$builder->connection->config) ? $builder->connection->config['cache_tables'] : false;
         $types = [];
 
         foreach ($arrTables as $tables) {
@@ -244,7 +292,6 @@ private function compile(Builder $builder)
                 }
             }
         }
-
         return $keys;
     }
 
@@ -335,12 +382,12 @@ 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');
+        $application_encoding = $this->applicationEncoding;
         if (is_null($application_encoding) || $application_encoding == false) {
             return $newQuery;
         }
-        $database_charset = config('database.sybase.database_charset');
-        $application_charset = config('database.sybase.application_charset');
+        $database_charset = $this->databaseCharset;
+        $application_charset = $this->applicationCharset;
         if (is_null($database_charset) || is_null($application_charset)) {
             throw new \Exception('[SYBASE] Database Charset and App Charset not set');
         }
@@ -376,21 +423,18 @@ public function select($query, $bindings = [], $useReadPdo = true)
 
             $result = [];
 
-            try {
-                do {
-                    $result += $statement->fetchAll($this->getFetchMode());
-                } while ($statement->nextRowset());
-            } catch (\Exception $e) {
-            }
+            do {
+                $result += $statement->fetchAll($this->getFetchMode());
+            } while ($statement->nextRowset());
 
             $result = [...$result];
 
-            $application_encoding = config('database.sybase.application_encoding');
+            $application_encoding = $this->applicationEncoding;
             if (is_null($application_encoding) || $application_encoding == false) {
                 return $result;
             }
-            $database_charset = config('database.sybase.database_charset');
-            $application_charset = config('database.sybase.application_charset');
+            $database_charset = $this->databaseCharset;
+            $application_charset = $this->applicationCharset;
             if (is_null($database_charset) || is_null($application_charset)) {
                 throw new \Exception('[SYBASE] Database Charset and App Charset not set');
             }

src/Database/Schema/Grammar.php

@@ -264,6 +264,18 @@ public function compileDropIfExists(Blueprint $blueprint, Fluent $command)
             ) DROP TABLE ".$blueprint->getTable();
     }
 
+    public function compileTables()
+    {
+        return "select
+    o.name                           as name,
+    user_name(o.uid)                 as [schema],
+    cast(reserved_pages(db_id(), o.id) as bigint) * @@maxpagesize as size_bytes
+from sysobjects o
+where o.type = 'U'
+order by o.name
+        ";
+    }
+
     /**
      * Compile a drop column command.
      *