[Phpgroupware-cvs] phpgwapi/inc class.schema_proc.inc.php,1.10

[ceb]

Update of phpgwapi/inc

Modified Files:
     Branch: MAIN
            class.schema_proc.inc.php lines: +9 -7

Log Message:
NOT NULL wasnt included to sql statement if nullable => false

====================================================
Index: phpgwapi/inc/class.schema_proc.inc.php
diff -u phpgwapi/inc/class.schema_proc.inc.php:1.9 
phpgwapi/inc/class.schema_proc.inc.php:1.10
--- phpgwapi/inc/class.schema_proc.inc.php:1.9  Thu Dec 30 06:47:31 2004
+++ phpgwapi/inc/class.schema_proc.inc.php      Sun Jan 16 22:08:35 2005
@@ -398,7 +398,8 @@
                function _GetFieldSQL($aField, &$sFieldSQL)
                {
                        global $DEBUG;
-                       if($DEBUG) { echo'<br>_GetFieldSQL(): Incoming ARRAY: 
'; var_dump($aField); }
+                       if($DEBUG) { echo '<br>_GetFieldSQL(): Incoming ARRAY: 
'; var_dump($aField); }
+
                        if(!is_array($aField))
                        {
                                return false;
@@ -426,7 +427,7 @@
                                                break;
                                        case 'default':
                                                $sDefault = $vAttrVal;
-                                               if($DEBUG) { 
echo'<br>_GetFieldSQL(): Default="' . $sDefault . '"'; }
+                                               if($DEBUG) { echo 
'<br>_GetFieldSQL(): Default="' . $sDefault . '"'; }
                                                break;
                                        case 'nullable':
                                                $bNullable = $vAttrVal;
@@ -441,16 +442,17 @@
                        {
                                if($bNullable == False)
                                {
-                                       $sBufNullable = ' NOT NULL';
+                                       //$sBufNullable = ' NOT NULL';
+                                       $sFieldSQL .= ' NOT NULL';
                                }

                                if($sDefault == '0')
                                {
-                                       $sFieldSQL .= " DEFAULT 0";
+                                       $sFieldSQL .= ' DEFAULT 0';
                                }
                                elseif(!is_numeric($sDefault) && $sDefault != 
'')
                                {
-                                       if($DEBUG) { echo'<br>_GetFieldSQL(): 
Calling TranslateDefault for "' . $sDefault . '"'; }
+                                       if($DEBUG) { echo '<br>_GetFieldSQL(): 
Calling TranslateDefault for "' . $sDefault . '"'; }
                                        // Get default DDL - useful for 
differences in date defaults (eg, now() vs. getdate())
                                        $sTranslatedDefault = 
$this->m_oTranslator->TranslateDefault($sDefault);
                                        $sFieldSQL .= " DEFAULT 
$sTranslatedDefault";
@@ -459,7 +461,7 @@
                                {
                                        $sFieldSQL .= " DEFAULT $sDefault";
                                }
-                               if($DEBUG) { echo'<br>_GetFieldSQL(): Outgoing 
SQL:   ' . $sFieldSQL; }
+                               if($DEBUG) { echo '<br>_GetFieldSQL(): Outgoing 
SQL:   ' . $sFieldSQL; }
                                return true;
                        }