RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

Mysql string > 255 now converts to TEXT type

Browse source
This commit is contained in:
zYne 2006-12-29 13:45:41 +00:00
parent 64923b584a
commit 8110cf8e89
6 changed files with 73 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Doctrine.php
View file

@ -132,7 +132,11 @@ final class Doctrine {
* default table type attribute * default table type attribute
*/ */
const ATTR_DEFAULT_TABLE_TYPE = 21; const ATTR_DEFAULT_TABLE_TYPE = 21;
const ATTR_DEF_TEXT_LENGTH = 30;
const ATTR_DEF_VARCHAR_LENGTH = 31;
const ATTR_DEF_TABLESPACE = 32;
const ATTR_EMULATE_DATABASE = 33;
const ATTR_DB_NAME_FORMAT = 34;
/** TODO: REMOVE THE FOLLOWING CONSTANTS AND UPDATE THE DOCS ! */ /** TODO: REMOVE THE FOLLOWING CONSTANTS AND UPDATE THE DOCS ! */

12
lib/Doctrine/Connection.php
View file

@ -148,8 +148,11 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
* @return Doctrine_Connection_Module connection module * @return Doctrine_Connection_Module connection module
*/ */
public function __get($name) { public function __get($name) {
if(isset($this->properties[$name]))
return $this->properties[$name];
if( ! isset($this->modules[$name])) if( ! isset($this->modules[$name]))
throw new Doctrine_Connection_Exception('Unknown module ' . $name); throw new Doctrine_Connection_Exception('Unknown module / property ' . $name);
if($this->modules[$name] === false) { if($this->modules[$name] === false) {
switch($name) { switch($name) {
@ -160,10 +163,7 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
$class = 'Doctrine_' . ucwords($name) . '_' . $this->getName(); $class = 'Doctrine_' . ucwords($name) . '_' . $this->getName();
$this->modules[$name] = new $class($this); $this->modules[$name] = new $class($this);
} }
} }
if(isset($this->properties[$name]))
return $this->properties[$name];
return $this->modules[$name]; return $this->modules[$name];
} }
@ -223,7 +223,7 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
public function quoteIdentifier($str, $checkOption = true) { public function quoteIdentifier($str, $checkOption = true) {
if ($checkOption && ! $this->getAttribute(Doctrine::ATTR_QUOTE_IDENTIFIER)) { if ($checkOption && ! $this->getAttribute(Doctrine::ATTR_QUOTE_IDENTIFIER)) {
return $str; return $str;
} }
$str = str_replace($this->properties['identifier_quoting']['end'], $str = str_replace($this->properties['identifier_quoting']['end'],
$this->properties['identifier_quoting']['escape'] . $this->properties['identifier_quoting']['escape'] .
$this->properties['identifier_quoting']['end'], $str); $this->properties['identifier_quoting']['end'], $str);

18
lib/Doctrine/DataDict/Mysql.php
View file

@ -130,7 +130,8 @@ class Doctrine_DataDict_Mysql extends Doctrine_DataDict {
* @return string DBMS specific SQL code portion that should be used to * @return string DBMS specific SQL code portion that should be used to
* declare the specified field. * declare the specified field.
*/ */
public function getNativeDeclaration($field) { public function getNativeDeclaration($field)
{
switch ($field['type']) { switch ($field['type']) {
case 'char': case 'char':
$length = (! empty($field['length'])) ? $field['length'] : false; $length = (! empty($field['length'])) ? $field['length'] : false;
@ -140,12 +141,17 @@ class Doctrine_DataDict_Mysql extends Doctrine_DataDict {
case 'array': case 'array':
case 'object': case 'object':
case 'string': case 'string':
if (empty($field['length']) && array_key_exists('default', $field)) {
$field['length'] = $this->conn->varchar_max_length; if ( ! isset($field['length'])) {
if(array_key_exists('default', $field)) {
$field['length'] = $this->conn->varchar_max_length;
} else {
$field['length'] = false;
}
} }
$length = (! empty($field['length'])) ? $field['length'] : false; $length = ($field['length'] < $this->conn->varchar_max_length) ? $field['length'] : false;
$fixed = (! empty($field['fixed'])) ? $field['fixed'] : false; $fixed = (isset($field['fixed'])) ? $field['fixed'] : false;
return $fixed ? ($length ? 'CHAR('.$length.')' : 'CHAR(255)') return $fixed ? ($length ? 'CHAR('.$length.')' : 'CHAR(255)')
: ($length ? 'VARCHAR(' . $length . ')' : 'TEXT'); : ($length ? 'VARCHAR(' . $length . ')' : 'TEXT');

81
lib/Doctrine/Export/Oracle.php
View file

@ -40,26 +40,28 @@ class Doctrine_Export_Oracle extends Doctrine_Export {
* @return mixed MDB2_OK on success, a MDB2 error on failure * @return mixed MDB2_OK on success, a MDB2 error on failure
* @access public * @access public
*/ */
public function createDatabase($name) { public function createDatabase($name)
if (!$db->options['emulate_database']) {
throw new Doctrine_Export_Oracle_Exception('database creation is only supported if the "emulate_database" option is enabled'); if ( ! $this->conn->getAttribute(Doctrine::ATTR_EMULATE_DATABASE))
throw new Doctrine_Export_Oracle_Exception('database creation is only supported if the "emulate_database" attribute is enabled');
$username = $db->options['database_name_prefix'].$name; $username = sprintf($this->conn->getAttribute(Doctrine::ATTR_DB_NAME_FORMAT), $name);
$password = $db->dsn['password'] ? $db->dsn['password'] : $name; $password = $this->conn->dsn['password'] ? $this->conn->dsn['password'] : $name;
$tablespace = $db->options['default_tablespace']
? ' DEFAULT TABLESPACE '.$db->options['default_tablespace'] : '';
$query = 'CREATE USER '.$username.' IDENTIFIED BY '.$password.$tablespace; $tablespace = $this->conn->getAttribute(Doctrine::ATTR_DB_NAME_FORMAT)
$result = $db->standaloneQuery($query, null, true); ? ' DEFAULT TABLESPACE '.$this->conn->options['default_tablespace'] : '';
$query = 'GRANT CREATE SESSION, CREATE TABLE, UNLIMITED TABLESPACE, CREATE SEQUENCE, CREATE TRIGGER TO '.$username; $query = 'CREATE USER ' . $username . ' IDENTIFIED BY ' . $password . $tablespace;
$result = $db->standaloneQuery($query, null, true); $result = $this->conn->query($query);
$query = 'GRANT CREATE SESSION, CREATE TABLE, UNLIMITED TABLESPACE, CREATE SEQUENCE, CREATE TRIGGER TO ' . $username;
$result = $this->conn->query($query);
if (PEAR::isError($result)) { if (PEAR::isError($result)) {
$query = 'DROP USER '.$username.' CASCADE'; $query = 'DROP USER '.$username.' CASCADE';
$result2 = $db->standaloneQuery($query, null, true); $result2 = $this->conn->query($query);
if (PEAR::isError($result2)) { if (PEAR::isError($result2)) {
return $db->raiseError($result2, null, null, return $this->conn->raiseError($result2, null, null,
'could not setup the database user', __FUNCTION__); 'could not setup the database user', __FUNCTION__);
} }
return $result; return $result;
@ -68,19 +70,21 @@ class Doctrine_Export_Oracle extends Doctrine_Export {
/** /**
* drop an existing database * drop an existing database
* *
* @param object $db database object that is extended by this class * @param object $this->conn database object that is extended by this class
* @param string $name name of the database that should be dropped * @param string $name name of the database that should be dropped
* @return mixed MDB2_OK on success, a MDB2 error on failure * @return mixed MDB2_OK on success, a MDB2 error on failure
* @access public * @access public
*/ */
public function dropDatabase($name) { public function dropDatabase($name)
if (!$db->options['emulate_database']) {
if ( ! $this->conn->getAttribute(Doctrine::ATTR_EMULATE_DATABASE))
throw new Doctrine_Export_Oracle_Exception('database dropping is only supported if the throw new Doctrine_Export_Oracle_Exception('database dropping is only supported if the
"emulate_database" option is enabled'); "emulate_database" option is enabled');
$username = $db->options['database_name_prefix'].$name; $username = sprintf($this->conn->getAttribute(Doctrine::ATTR_DB_NAME_FORMAT), $name);
return $db->standaloneQuery('DROP USER '.$username.' CASCADE', null, true);
return $this->conn->query('DROP USER ' . $username . ' CASCADE');
} }
/** /**
* add an autoincrement sequence + trigger * add an autoincrement sequence + trigger
@ -91,7 +95,8 @@ class Doctrine_Export_Oracle extends Doctrine_Export {
* @return mixed MDB2_OK on success, a MDB2 error on failure * @return mixed MDB2_OK on success, a MDB2 error on failure
* @access private * @access private
*/ */
public function _makeAutoincrement($name, $table, $start = 1) { public function _makeAutoincrement($name, $table, $start = 1)
{
$table = strtoupper($table); $table = strtoupper($table);
$index_name = $table . '_AI_PK'; $index_name = $table . '_AI_PK';
$definition = array( $definition = array(
@ -102,27 +107,27 @@ class Doctrine_Export_Oracle extends Doctrine_Export {
/** /**
if (PEAR::isError($result)) { if (PEAR::isError($result)) {
return $db->raiseError($result, null, null, return $this->conn->raiseError($result, null, null,
'primary key for autoincrement PK could not be created', __FUNCTION__); 'primary key for autoincrement PK could not be created', __FUNCTION__);
} }
*/ */
if (is_null($start)) { if (is_null($start)) {
$db->beginTransaction(); $this->conn->beginTransaction();
$query = 'SELECT MAX(' . $db->quoteIdentifier($name, true) . ') FROM ' . $db->quoteIdentifier($table, true); $query = 'SELECT MAX(' . $this->conn->quoteIdentifier($name, true) . ') FROM ' . $this->conn->quoteIdentifier($table, true);
$start = $this->db->queryOne($query, 'integer'); $start = $this->db->queryOne($query, 'integer');
if (PEAR::isError($start)) { if (PEAR::isError($start)) {
return $start; return $start;
} }
++$start; ++$start;
$result = $this->createSequence($table, $start); $result = $this->createSequence($table, $start);
$db->commit(); $this->conn->commit();
} else { } else {
$result = $this->createSequence($table, $start); $result = $this->createSequence($table, $start);
} }
/** /**
if (PEAR::isError($result)) { if (PEAR::isError($result)) {
return $db->raiseError($result, null, null, return $this->conn->raiseError($result, null, null,
'sequence for autoincrement PK could not be created', __FUNCTION__); 'sequence for autoincrement PK could not be created', __FUNCTION__);
} }
*/ */
@ -160,7 +165,8 @@ END;
* @param string $table name of the table * @param string $table name of the table
* @return void * @return void
*/ */
public function dropAutoincrement($table) { public function dropAutoincrement($table)
{
$table = strtoupper($table); $table = strtoupper($table);
$trigger_name = $table . '_AI_PK'; $trigger_name = $table . '_AI_PK';
$trigger_name_quoted = $this->conn->getDbh()->quote($trigger_name); $trigger_name_quoted = $this->conn->getDbh()->quote($trigger_name);
@ -169,7 +175,7 @@ END;
$trigger = $this->conn->fetchOne($query); $trigger = $this->conn->fetchOne($query);
if($trigger) { if($trigger) {
$trigger_name = $db->quoteIdentifier($table . '_AI_PK', true); $trigger_name = $this->conn->quoteIdentifier($table . '_AI_PK', true);
$trigger_sql = 'DROP TRIGGER ' . $trigger_name; $trigger_sql = 'DROP TRIGGER ' . $trigger_name;
// if throws exception, trigger for autoincrement PK could not be dropped // if throws exception, trigger for autoincrement PK could not be dropped
@ -215,7 +221,8 @@ END;
* *
* @return void * @return void
*/ */
public function createTable($name, $fields, $options = array()) { public function createTable($name, $fields, $options = array())
{
$this->conn->beginTransaction(); $this->conn->beginTransaction();
$result = parent::createTable($name, $fields, $options); $result = parent::createTable($name, $fields, $options);
@ -236,11 +243,12 @@ END;
* @param string $name name of the table that should be dropped * @param string $name name of the table that should be dropped
* @return void * @return void
*/ */
public function dropTable($name) { public function dropTable($name)
//$db->beginNestedTransaction(); {
//$this->conn->beginNestedTransaction();
$result = $this->dropAutoincrement($name); $result = $this->dropAutoincrement($name);
$result = parent::dropTable($name); $result = parent::dropTable($name);
//$db->completeNestedTransaction(); //$this->conn->completeNestedTransaction();
return $result; return $result;
} }
/** /**
@ -331,10 +339,11 @@ END;
* actually perform them otherwise. * actually perform them otherwise.
* @return void * @return void
*/ */
public function alterTable($name, array $changes, $check) { public function alterTable($name, array $changes, $check)
{
foreach ($changes as $change_name => $change) { foreach ($changes as $changeName => $change) {
switch ($change_name) { switch ($changeName) {
case 'add': case 'add':
case 'remove': case 'remove':
case 'change': case 'change':
@ -343,7 +352,7 @@ END;
break; break;
default: default:
return $this->conn->raiseError(MDB2_ERROR_CANNOT_ALTER, null, null, return $this->conn->raiseError(MDB2_ERROR_CANNOT_ALTER, null, null,
'change type "'.$change_name.'" not yet supported', __FUNCTION__); 'change type "'.$changeName.'" not yet supported', __FUNCTION__);
} }
} }
@ -408,7 +417,7 @@ END;
/** /**
* create sequence * create sequence
* *
* @param object $db database object that is extended by this class * @param object $this->conn database object that is extended by this class
* @param string $seqName name of the sequence to be created * @param string $seqName name of the sequence to be created
* @param string $start start value of the sequence; default is 1 * @param string $start start value of the sequence; default is 1
* @return void * @return void
@ -422,7 +431,7 @@ END;
/** /**
* drop existing sequence * drop existing sequence
* *
* @param object $db database object that is extended by this class * @param object $this->conn database object that is extended by this class
* @param string $seqName name of the sequence to be dropped * @param string $seqName name of the sequence to be dropped
* @return void * @return void
*/ */

5
tests/DataDict/MysqlTestCase.php
View file

@ -76,6 +76,11 @@ class Doctrine_DataDict_Mysql_TestCase extends Doctrine_Driver_UnitTestCase {
$this->assertEqual($this->dataDict->GetNativeDeclaration($a), 'TEXT'); $this->assertEqual($this->dataDict->GetNativeDeclaration($a), 'TEXT');
} }
public function testGetNativeDeclarationSupportsStringTypeWithLongLength() {
$a = array('type' => 'string', 'length' => 2000);
$this->assertEqual($this->dataDict->GetNativeDeclaration($a), 'TEXT');
}
public function testGetNativeDeclarationSupportsArrayType2() { public function testGetNativeDeclarationSupportsArrayType2() {
$a = array('type' => 'array'); $a = array('type' => 'array');

1
tests/Export/PgsqlTestCase.php
View file

@ -2,7 +2,6 @@
class Doctrine_Export_Pgsql_TestCase extends Doctrine_UnitTestCase { class Doctrine_Export_Pgsql_TestCase extends Doctrine_UnitTestCase {
public function testCreateDatabaseExecutesSql() { public function testCreateDatabaseExecutesSql() {
$this->export->createDatabase('db'); $this->export->createDatabase('db');
$this->assertEqual($this->adapter->pop(), 'CREATE DATABASE db'); $this->assertEqual($this->adapter->pop(), 'CREATE DATABASE db');
} }
public function testDropDatabaseExecutesSql() { public function testDropDatabaseExecutesSql() {