cvs: pear /MDB2/MDB2/Driver/Reverse mysql.php mysqli.php

dufuz Fri Jun 10 11:53:13 2005 EDT Modified files: /pear/MDB2/MDB2/Driver/Reverse mysqli.php mysql.php Log: If it is auto_increment then make a note of it, same with primary, no need to use unique anymore in that situation http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/Reverse/mysqli.php?r1=1.9&r2=1.10&ty=u Index: pear/MDB2/MDB2/Driver/Reverse/mysqli.php diff -u pear/MDB2/MDB2/Driver/Reverse/mysqli.php:1.9 pear/MDB2/MDB2/Driver/Reverse/mysqli.php:1.10 --- pear/MDB2/MDB2/Driver/Reverse/mysqli.php:1.9 Thu Apr 21 11:29:23 2005 +++ pear/MDB2/MDB2/Driver/Reverse/mysqli.php Fri Jun 10 11:53:11 2005 @@ -42,7 +42,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ // -// $Id: mysqli.php,v 1.9 2005/04/21 15:29:23 lsmith Exp $ +// $Id: mysqli.php,v 1.10 2005/06/10 15:53:11 dufuz Exp $ // require_once 'MDB2/Driver/Reverse/Common.php'; @@ -142,6 +142,7 @@ } else { $column = array_change_key_case($column, CASE_LOWER); } + if ($field_name == $column['field']) { list($types, $length) = $db->datatype->mapNativeDatatype($column); unset($notnull); @@ -165,14 +166,17 @@ $definition[0][$key]['length'] = $length; } } + if (isset($column['extra']) && $column['extra'] == 'auto_increment') { $implicit_sequence = array(); $implicit_sequence['on'] = array(); + $implicit_sequence['on']['autoincrement'] = true; $implicit_sequence['on']['table'] = $table; $implicit_sequence['on']['field'] = $field_name; $definition[1]['name'] = $table; $definition[1]['definition'] = $implicit_sequence; } + if (isset($column['key']) && $column['key'] == 'PRI') { // check that its not just a unique field $query = "SHOW INDEX FROM $table"; @@ -192,14 +196,16 @@ break; } } + if ($is_primary) { $implicit_index = array(); - $implicit_index['unique'] = true; + $implicit_index['primary'] = true; $implicit_index['fields'][$field_name] = ''; $definition[2]['name'] = $field_name; $definition[2]['definition'] = $implicit_index; } } + return $definition; } } http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/Reverse/mysql.php?r1=1.24&r2=1.25&ty=u Index: pear/MDB2/MDB2/Driver/Reverse/mysql.php diff -u pear/MDB2/MDB2/Driver/Reverse/mysql.php:1.24 pear/MDB2/MDB2/Driver/Reverse/mysql.php:1.25 --- pear/MDB2/MDB2/Driver/Reverse/mysql.php:1.24 Fri Jun 10 10:17:28 2005 +++ pear/MDB2/MDB2/Driver/Reverse/mysql.php Fri Jun 10 11:53:11 2005 @@ -42,7 +42,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ // -// $Id: mysql.php,v 1.24 2005/06/10 14:17:28 lsmith Exp $ +// $Id: mysql.php,v 1.25 2005/06/10 15:53:11 dufuz Exp $ // require_once 'MDB2/Driver/Reverse/Common.php'; @@ -113,6 +113,7 @@ if (isset($column['extra']) && $column['extra'] == 'auto_increment') { $implicit_sequence = array(); $implicit_sequence['on'] = array(); + $implicit_sequence['on']['autoincrement'] = true; $implicit_sequence['on']['table'] = $table; $implicit_sequence['on']['field'] = $field_name; $definition[1]['name'] = $table; @@ -139,7 +140,7 @@ } if ($is_primary) { $implicit_index = array(); - $implicit_index['unique'] = true; + $implicit_index['primary'] = true; $implicit_index['fields'][$field_name] = ''; $definition[2]['name'] = $field_name; $definition[2]['definition'] = $implicit_index;