From 1f8aafd36ba6b7f8bb33e8f06067b7f1ff2a3989 Mon Sep 17 00:00:00 2001
From: prog5 <V.Belogai@everest.ua>
Date: Wed, 3 Jun 2015 17:57:47 +0300
Subject: [PATCH] #8573 fix

---
 framework/db/oci/Schema.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/framework/db/oci/Schema.php b/framework/db/oci/Schema.php
index 96f83260b2..1fcd993f0f 100644
--- a/framework/db/oci/Schema.php
+++ b/framework/db/oci/Schema.php
@@ -395,12 +395,14 @@ SQL;
 
         if (strpos($dbType, 'FLOAT') !== false || strpos($dbType, 'DOUBLE') !== false) {
             $column->type = 'double';
-        } elseif ($dbType == 'NUMBER' || strpos($dbType, 'INTEGER') !== false) {
-            if ($scale !== null && $scale > 0) {
+        }  elseif (strpos($dbType, 'NUMBER') !== false) {
+            if ($scale === null || $scale > 0) {
                 $column->type = 'decimal';
             } else {
                 $column->type = 'integer';
             }
+        } elseif (strpos($dbType, 'INTEGER') !== false) {
+            $column->type = 'integer';
         } elseif (strpos($dbType, 'BLOB') !== false) {
             $column->type = 'binary';
         } elseif (strpos($dbType, 'CLOB') !== false) {