Changeset 749
- Timestamp:
- 01/20/08 21:05:17 (11 months ago)
- Files:
-
- branches/1.0.x/lib/jelix/plugins/db/mysql/mysql.dbtools.php (modified) (1 diff)
- branches/1.0.x/lib/jelix/plugins/db/mysql/mysql.dbtools.php (modified) (1 diff)
- branches/1.0.x/lib/jelix/plugins/db/mysql/mysql.dbtools.php (modified) (1 diff)
- trunk/lib/jelix/plugins/db/mysql/mysql.dbtools.php (modified) (1 diff)
- trunk/lib/jelix/plugins/db/mysql/mysql.dbtools.php (modified) (1 diff)
- trunk/lib/jelix/plugins/db/mysql/mysql.dbtools.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/1.0.x/lib/jelix/plugins/db/mysql/mysql.dbtools.php
r640 r749 63 63 $field->notNull = ($line->Null == 'NO'); 64 64 $field->primary = ($line->Key == 'PRI'); 65 $field->autoIncrement = ($line->Extra == 'auto_increment'); 65 66 $field->hasDefault = ($line->Default != '' || !($line->Default == null && $field->notNull)); 66 $field->default = $line->Default; 67 $field->autoIncrement = ($line->Extra == 'auto_increment'); 67 // to fix a bug in php 5.2.5 or mysql 5.0.51 68 if($field->notNull && $line->Default === null && !$field->autoIncrement) 69 $field->default =''; 70 else 71 $field->default = $line->Default; 68 72 $results[$line->Field] = $field; 69 73 } branches/1.0.x/lib/jelix/plugins/db/mysql/mysql.dbtools.php
r640 r749 63 63 $field->notNull = ($line->Null == 'NO'); 64 64 $field->primary = ($line->Key == 'PRI'); 65 $field->autoIncrement = ($line->Extra == 'auto_increment'); 65 66 $field->hasDefault = ($line->Default != '' || !($line->Default == null && $field->notNull)); 66 $field->default = $line->Default; 67 $field->autoIncrement = ($line->Extra == 'auto_increment'); 67 // to fix a bug in php 5.2.5 or mysql 5.0.51 68 if($field->notNull && $line->Default === null && !$field->autoIncrement) 69 $field->default =''; 70 else 71 $field->default = $line->Default; 68 72 $results[$line->Field] = $field; 69 73 } branches/1.0.x/lib/jelix/plugins/db/mysql/mysql.dbtools.php
r640 r749 63 63 $field->notNull = ($line->Null == 'NO'); 64 64 $field->primary = ($line->Key == 'PRI'); 65 $field->autoIncrement = ($line->Extra == 'auto_increment'); 65 66 $field->hasDefault = ($line->Default != '' || !($line->Default == null && $field->notNull)); 66 $field->default = $line->Default; 67 $field->autoIncrement = ($line->Extra == 'auto_increment'); 67 // to fix a bug in php 5.2.5 or mysql 5.0.51 68 if($field->notNull && $line->Default === null && !$field->autoIncrement) 69 $field->default =''; 70 else 71 $field->default = $line->Default; 68 72 $results[$line->Field] = $field; 69 73 } trunk/lib/jelix/plugins/db/mysql/mysql.dbtools.php
r640 r749 63 63 $field->notNull = ($line->Null == 'NO'); 64 64 $field->primary = ($line->Key == 'PRI'); 65 $field->autoIncrement = ($line->Extra == 'auto_increment'); 65 66 $field->hasDefault = ($line->Default != '' || !($line->Default == null && $field->notNull)); 66 $field->default = $line->Default; 67 $field->autoIncrement = ($line->Extra == 'auto_increment'); 67 // to fix a bug in php 5.2.5 or mysql 5.0.51 68 if($field->notNull && $line->Default === null && !$field->autoIncrement) 69 $field->default =''; 70 else 71 $field->default = $line->Default; 68 72 $results[$line->Field] = $field; 69 73 } trunk/lib/jelix/plugins/db/mysql/mysql.dbtools.php
r640 r749 63 63 $field->notNull = ($line->Null == 'NO'); 64 64 $field->primary = ($line->Key == 'PRI'); 65 $field->autoIncrement = ($line->Extra == 'auto_increment'); 65 66 $field->hasDefault = ($line->Default != '' || !($line->Default == null && $field->notNull)); 66 $field->default = $line->Default; 67 $field->autoIncrement = ($line->Extra == 'auto_increment'); 67 // to fix a bug in php 5.2.5 or mysql 5.0.51 68 if($field->notNull && $line->Default === null && !$field->autoIncrement) 69 $field->default =''; 70 else 71 $field->default = $line->Default; 68 72 $results[$line->Field] = $field; 69 73 } trunk/lib/jelix/plugins/db/mysql/mysql.dbtools.php
r640 r749 63 63 $field->notNull = ($line->Null == 'NO'); 64 64 $field->primary = ($line->Key == 'PRI'); 65 $field->autoIncrement = ($line->Extra == 'auto_increment'); 65 66 $field->hasDefault = ($line->Default != '' || !($line->Default == null && $field->notNull)); 66 $field->default = $line->Default; 67 $field->autoIncrement = ($line->Extra == 'auto_increment'); 67 // to fix a bug in php 5.2.5 or mysql 5.0.51 68 if($field->notNull && $line->Default === null && !$field->autoIncrement) 69 $field->default =''; 70 else 71 $field->default = $line->Default; 68 72 $results[$line->Field] = $field; 69 73 }
