Changeset 3074
- Timestamp:
- 04/01/07 02:56:57 (22 months ago)
- Files:
-
- 6 modified
-
branches/1.1/lib/model/common.plugin.php (modified) (2 diffs)
-
branches/1.1/lib/plugins.php (modified) (1 diff)
-
branches/1.2/lib/model/common.plugin.php (modified) (2 diffs)
-
branches/1.2/lib/plugins.php (modified) (1 diff)
-
trunk/lib/model/common.plugin.php (modified) (2 diffs)
-
trunk/lib/plugins.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/1.1/lib/model/common.plugin.php
r2936 r3074 82 82 $query = "CREATE TABLE {$database['prefix']}{$name} (owner int(11) NOT NULL default '0',"; 83 83 $isaiExists = false; 84 $index = ''; 84 85 foreach($fields as $field) { 85 86 $ai = ''; 86 87 if( strtolower($field['attribute']) == 'int' || strtolower($field['attribute']) == 'mediumint' ){ 87 if( true == $field['autoincrement'] && !$isaiExists){88 if($field['autoincrement'] == 1 && !$isaiExists){ 88 89 $ai = ' AUTO_INCREMENT '; 89 90 $isaiExists = true; 91 if(!in_array($field['name'], $keys)) 92 $index = ", KEY({$field['name']})"; 90 93 } 91 94 } … … 99 102 array_unshift($keys, 'owner'); 100 103 $query .= " PRIMARY KEY (" . implode(',',$keys) . ")"; 104 $query .= $index; 101 105 $query .= ") TYPE=MyISAM "; 102 106 $query .= ($database['utf8'] == true) ? 'DEFAULT CHARSET=utf8' : ''; -
branches/1.1/lib/plugins.php
r2775 r3074 49 49 $fieldIsNull = isset($field['isnull']) ? $field['isnull'][0]['.value'] : 1; 50 50 $fieldDefault = isset($field['default']) ? $field['default'][0]['.value'] : null; 51 $fieldAutoIncrement = isset($field['autoincrement']) ? $field['autoincrement'][0]['.value'] : 0; 51 52 52 array_push($storageMappings, array('name' => $fieldName, 'attribute' => $fieldAttribute, 'length' => $fieldLength, 'isnull' => $fieldIsNull, 'default' => $fieldDefault ));53 array_push($storageMappings, array('name' => $fieldName, 'attribute' => $fieldAttribute, 'length' => $fieldLength, 'isnull' => $fieldIsNull, 'default' => $fieldDefault, 'autoincrement' => $fieldAutoIncrement)); 53 54 } 54 55 } -
branches/1.2/lib/model/common.plugin.php
r2936 r3074 82 82 $query = "CREATE TABLE {$database['prefix']}{$name} (owner int(11) NOT NULL default '0',"; 83 83 $isaiExists = false; 84 $index = ''; 84 85 foreach($fields as $field) { 85 86 $ai = ''; 86 87 if( strtolower($field['attribute']) == 'int' || strtolower($field['attribute']) == 'mediumint' ){ 87 if( true == $field['autoincrement'] && !$isaiExists){88 if($field['autoincrement'] == 1 && !$isaiExists){ 88 89 $ai = ' AUTO_INCREMENT '; 89 90 $isaiExists = true; 91 if(!in_array($field['name'], $keys)) 92 $index = ", KEY({$field['name']})"; 90 93 } 91 94 } … … 99 102 array_unshift($keys, 'owner'); 100 103 $query .= " PRIMARY KEY (" . implode(',',$keys) . ")"; 104 $query .= $index; 101 105 $query .= ") TYPE=MyISAM "; 102 106 $query .= ($database['utf8'] == true) ? 'DEFAULT CHARSET=utf8' : ''; -
branches/1.2/lib/plugins.php
r3036 r3074 52 52 $fieldIsNull = isset($field['isnull']) ? $field['isnull'][0]['.value'] : 1; 53 53 $fieldDefault = isset($field['default']) ? $field['default'][0]['.value'] : null; 54 $fieldAutoIncrement = isset($field['autoincrement']) ? $field['autoincrement'][0]['.value'] : 0; 54 55 55 array_push($storageMappings, array('name' => $fieldName, 'attribute' => $fieldAttribute, 'length' => $fieldLength, 'isnull' => $fieldIsNull, 'default' => $fieldDefault ));56 array_push($storageMappings, array('name' => $fieldName, 'attribute' => $fieldAttribute, 'length' => $fieldLength, 'isnull' => $fieldIsNull, 'default' => $fieldDefault, 'autoincrement' => $fieldAutoIncrement)); 56 57 } 57 58 } -
trunk/lib/model/common.plugin.php
r3038 r3074 82 82 $query = "CREATE TABLE {$database['prefix']}{$name} (owner int(11) NOT NULL default '0',"; 83 83 $isaiExists = false; 84 $index = ''; 84 85 foreach($fields as $field) { 85 86 $ai = ''; 86 87 if( strtolower($field['attribute']) == 'int' || strtolower($field['attribute']) == 'mediumint' ){ 87 if( true == $field['autoincrement'] && !$isaiExists){88 if($field['autoincrement'] == 1 && !$isaiExists){ 88 89 $ai = ' AUTO_INCREMENT '; 89 90 $isaiExists = true; 91 if(!in_array($field['name'], $keys)) 92 $index = ", KEY({$field['name']})"; 90 93 } 91 94 } … … 99 102 array_unshift($keys, 'owner'); 100 103 $query .= " PRIMARY KEY (" . implode(',',$keys) . ")"; 104 $query .= $index; 101 105 $query .= ") TYPE=MyISAM "; 102 106 $query .= ($database['utf8'] == true) ? 'DEFAULT CHARSET=utf8' : ''; -
trunk/lib/plugins.php
r3038 r3074 49 49 $fieldIsNull = isset($field['isnull']) ? $field['isnull'][0]['.value'] : 1; 50 50 $fieldDefault = isset($field['default']) ? $field['default'][0]['.value'] : null; 51 $fieldAutoIncrement = isset($field['autoincrement']) ? $field['autoincrement'][0]['.value'] : 0; 51 52 52 array_push($storageMappings, array('name' => $fieldName, 'attribute' => $fieldAttribute, 'length' => $fieldLength, 'isnull' => $fieldIsNull, 'default' => $fieldDefault ));53 array_push($storageMappings, array('name' => $fieldName, 'attribute' => $fieldAttribute, 'length' => $fieldLength, 'isnull' => $fieldIsNull, 'default' => $fieldDefault, 'autoincrement' => $fieldAutoIncrement)); 53 54 } 54 55 }
