- Añadidas funciones restantes a la nueva clase Database.

- Modificado ModelClass para usar Database. - Cargadp appsettings para mayor compatibilidad. - Corregido el bootstrap de los tests.
NeoRazorX · May 24, 2022 · b90458e · b90458e
1 parent 39baf5f
commit b90458e
Show file tree

Hide file tree

Showing 24 changed files with 121 additions and 223 deletions.
diff --git a/Core/Bridge/DatabaseMysql.php b/Core/Bridge/DatabaseMysql.php
@@ -53,6 +53,30 @@ public function beginTransaction(): bool
         return $this->exec('START TRANSACTION;');
     }
 
+    public function castColumn(string $name, string $type): string
+    {
+        switch ($type) {
+            case 'int':
+            case 'integer':
+                return 'CAST(' . $name . ' AS UNSIGNED)';
+
+            case 'float':
+                return 'CAST(' . $name . ' AS DECIMAL(10,2))';
+
+            case 'string':
+                return 'CAST(' . $name . ' AS CHAR)';
+
+            case 'date':
+                return 'CAST(' . $name . ' AS DATE)';
+
+            case 'datetime':
+                return 'CAST(' . $name . ' AS DATETIME)';
+
+            default:
+                return $name;
+        }
+    }
+
     public function clearLastErrorMsg(): void
     {
         $this->lastErrorMsg = '';
@@ -182,7 +206,7 @@ public function select(string $sql, int $limit = 0, int $offset = 0): array
         return $rows;
     }
 
-    public function updateSequence(string $tableName, string $fields): void
+    public function updateSequence(string $tableName, array $fields): void
     {
         // unnecessary on mysql
     }

diff --git a/Core/Bridge/DatabasePostgres.php b/Core/Bridge/DatabasePostgres.php
@@ -38,6 +38,33 @@ public function beginTransaction(): bool
         return $this->exec('START TRANSACTION;');
     }
 
+    public function castColumn(string $name, string $type): string
+    {
+        switch ($type) {
+            case 'int':
+            case 'integer':
+                return "CAST($name AS INTEGER)";
+
+            case 'double':
+                return "CAST($name AS DOUBLE PRECISION)";
+
+            case 'string':
+                return "CAST($name AS TEXT)";
+
+            case 'boolean':
+                return "CAST($name AS BOOLEAN)";
+
+            case 'date':
+                return "CAST($name AS DATE)";
+
+            case 'datetime':
+                return "CAST($name AS TIMESTAMP)";
+
+            default:
+                return $name;
+        }
+    }
+
     public function clearLastErrorMsg(): void
     {
         $this->lastErrorMsg = '';
@@ -162,7 +189,7 @@ public function select(string $sql, int $limit, int $offset): array
         return $rows;
     }
 
-    public function updateSequence(string $tableName, string $fields): void
+    public function updateSequence(string $tableName, array $fields): void
     {
         foreach ($fields as $colName => $field) {
             // serial type

diff --git a/Core/Contract/DbInterface.php b/Core/Contract/DbInterface.php
@@ -23,6 +23,8 @@ interface DbInterface
 {
     public function beginTransaction(): bool;
 
+    public function castColumn(string $name, string $type): string;
+
     public function clearLastErrorMsg(): void;
 
     public function close(): bool;
@@ -51,7 +53,7 @@ public function rollback(): bool;
 
     public function select(string $sql, int $limit, int $offset): array;
 
-    public function updateSequence(string $tableName, string $fields): void;
+    public function updateSequence(string $tableName, array $fields): void;
 
     public function version(): string;
 }
diff --git a/Core/Database.php b/Core/Database.php
@@ -59,41 +59,9 @@ public static function beginTransaction(): bool
     /**
      * @throws KernelException
      */
-    private static function bridge(): DbInterface
+    public static function castColumn(string $name, string $type): string
     {
-        if (isset(self::$bridge)) {
-            return self::$bridge;
-        }
-
-        if (empty(Setup::get('db_host'))) {
-            throw new KernelException('DatabaseError', 'no-db-setup');
-        }
-
-        switch (Setup::get('db_type')) {
-            case 'mysql':
-                self::$bridge = new DatabaseMysql(
-                    Setup::get('db_host'),
-                    Setup::get('db_user'),
-                    Setup::get('db_pass'),
-                    Setup::get('db_name'),
-                    Setup::get('db_port')
-                );
-                break;
-
-            case 'postgresql':
-                self::$bridge = new DatabasePostgres(
-                    Setup::get('db_host'),
-                    Setup::get('db_user'),
-                    Setup::get('db_pass'),
-                    Setup::get('db_name'),
-                    Setup::get('db_port')
-                );
-                break;
-
-            default:
-                throw new KernelException('DatabaseError', 'no-db-type');
-        }
-        return self::$bridge;
+        return self::bridge()->castColumn($name, $type);
     }
 
     /**
@@ -263,7 +231,7 @@ public static function var2str($val): string
     /**
      * @throws KernelException
      */
-    public static function updateSequence(string $tableName, string $fields): void
+    public static function updateSequence(string $tableName, array $fields): void
     {
         self::bridge()->updateSequence($tableName, $fields);
     }
@@ -276,6 +244,46 @@ public static function version(): string
         return self::bridge()->version();
     }
 
+    /**
+     * @throws KernelException
+     */
+    private static function bridge(): DbInterface
+    {
+        if (isset(self::$bridge)) {
+            return self::$bridge;
+        }
+
+        if (empty(Setup::get('db_host'))) {
+            throw new KernelException('DatabaseError', 'no-db-setup');
+        }
+
+        switch (Setup::get('db_type')) {
+            case 'mysql':
+                self::$bridge = new DatabaseMysql(
+                    Setup::get('db_host'),
+                    Setup::get('db_user'),
+                    Setup::get('db_pass'),
+                    Setup::get('db_name'),
+                    Setup::get('db_port')
+                );
+                break;
+
+            case 'postgresql':
+                self::$bridge = new DatabasePostgres(
+                    Setup::get('db_host'),
+                    Setup::get('db_user'),
+                    Setup::get('db_pass'),
+                    Setup::get('db_name'),
+                    Setup::get('db_port')
+                );
+                break;
+
+            default:
+                throw new KernelException('DatabaseError', 'no-db-type');
+        }
+        return self::$bridge;
+    }
+
     private static function log(): Logger
     {
         if (!isset(self::$logger)) {

diff --git a/Core/Model/Base/ModelClass.php b/Core/Model/Base/ModelClass.php
@@ -20,6 +20,7 @@
 namespace FacturaScripts\Core\Model\Base;
 
 use FacturaScripts\Core\Base\DataBase\DataBaseWhere;
+use FacturaScripts\Core\Database;
 use FacturaScripts\Dinamic\Model\CodeModel;
 
 /**
@@ -212,7 +213,7 @@ public function newCode(string $field = '', array $where = [])
         if (false === in_array($modelFields[$field]['type'], ['integer', 'int', 'serial'])) {
             // Set Where to Integers values only
             $where[] = new DataBaseWhere($field, '^-?[0-9]+$', 'REGEXP');
-            $field = self::$dataBase->getEngine()->getSQL()->sql2Int($field);
+            $field = Database::castColumn($field, 'int');
         }
 
         // Search for new code value
@@ -359,7 +360,7 @@ protected function saveInsert(array $values = [])
             if ($this->primaryColumnValue() === null) {
                 $this->{static::primaryColumn()} = self::$dataBase->lastval();
             } else {
-                self::$dataBase->updateSequence(static::tableName(), $this->getModelFields());
+                Database::updateSequence(static::tableName(), $this->getModelFields());
             }
 
             $this->pipe('saveInsert');

diff --git a/Core/Setup.php b/Core/Setup.php
@@ -73,24 +73,6 @@ public static function load(string $folder): void
         }
     }
 
-    public static function loadCompatibility(): void
-    {
-        $constants = [
-            'FS_CODPAIS' => ['property' => 'codpais', 'default' => 'ESP'],
-            'FS_NF0' => ['property' => 'decimals', 'default' => 2],
-            'FS_NF1' => ['property' => 'decimal_separator', 'default' => ','],
-            'FS_NF2' => ['property' => 'thousands_separator', 'default' => ' '],
-            'FS_CURRENCY_POS' => ['property' => 'currency_position', 'default' => 'right'],
-            'FS_ITEM_LIMIT' => ['property' => 'item_limit', 'default' => 50],
-        ];
-
-        foreach ($constants as $key => $value) {
-            if (!defined($key)) {
-                define($key, self::read('default', $value['property'], $value['default']));
-            }
-        }
-    }
-
     public static function set(string $property, $value): void
     {
         // properties are case-insensitive

diff --git a/Dinamic/Lib/AjaxForms/AccountingFooterHTML.php b/Dinamic/Lib/AjaxForms/AccountingFooterHTML.php
diff --git a/Dinamic/Lib/AjaxForms/AccountingHeaderHTML.php b/Dinamic/Lib/AjaxForms/AccountingHeaderHTML.php
diff --git a/Dinamic/Lib/AjaxForms/AccountingLineHTML.php b/Dinamic/Lib/AjaxForms/AccountingLineHTML.php
diff --git a/Dinamic/Lib/AjaxForms/AccountingModalHTML.php b/Dinamic/Lib/AjaxForms/AccountingModalHTML.php
diff --git a/Dinamic/Lib/BusinessDocumentFormTools.php b/Dinamic/Lib/BusinessDocumentFormTools.php
diff --git a/Dinamic/Lib/CommissionTools.php b/Dinamic/Lib/CommissionTools.php
diff --git a/Dinamic/Lib/ExtendedController/BusinessDocumentController.php b/Dinamic/Lib/ExtendedController/BusinessDocumentController.php
diff --git a/Dinamic/Lib/ExtendedController/BusinessDocumentView.php b/Dinamic/Lib/ExtendedController/BusinessDocumentView.php
diff --git a/Dinamic/Lib/ExtendedController/GridView.php b/Dinamic/Lib/ExtendedController/GridView.php
diff --git a/Dinamic/Lib/ExtendedController/PurchaseDocumentController.php b/Dinamic/Lib/ExtendedController/PurchaseDocumentController.php
diff --git a/Dinamic/Lib/ExtendedController/SalesDocumentController.php b/Dinamic/Lib/ExtendedController/SalesDocumentController.php
diff --git a/Dinamic/Model/Base/GridModelInterface.php b/Dinamic/Model/Base/GridModelInterface.php
diff --git a/Dinamic/Model/Comision.php b/Dinamic/Model/Comision.php
diff --git a/Dinamic/Model/Join/LiquidacionComisionFactura.php b/Dinamic/Model/Join/LiquidacionComisionFactura.php