Skip to content

D
doctrine-dbal
Commit 65ebec5a authored by zYne's avatar zYne
Browse files
Options

Fixed sqlite connection function binding issue when using Doctrine_Db as well... 

Fixed sqlite connection function binding issue when using Doctrine_Db as well as added proper primary key handling for export methods
parent 56ff9378
Show whitespace changes
Inline Side-by-side
Showing with 185 additions and 29 deletions
lib/Doctrine/Connection/Mssql.php
View file @ 65ebec5a
......@@ -138,4 +138,62 @@ class Doctrine_Connection_Mssql extends Doctrine_Connection
return $query;
}
/**
* return version information about the server
*
* @param bool $native determines if the raw version string should be returned
* @return mixed array/string with version information or MDB2 error object
* @access public
*/
function getServerVersion($native = false)
{
if ($this->connected_server_info) {
$serverInfo = $this->connected_server_info;
} else {
$query = 'SELECT @@VERSION';
$serverInfo = $this->fetchOne($query);
}
// cache server_info
$this->connected_server_info = $serverInfo;
if ( ! $native) {
if (preg_match('/([0-9]+)\.([0-9]+)\.([0-9]+)/', $serverInfo, $tmp)) {
$serverInfo = array(
'major' => $tmp[1],
'minor' => $tmp[2],
'patch' => $tmp[3],
'extra' => null,
'native' => $serverInfo,
);
} else {
$serverInfo = array(
'major' => null,
'minor' => null,
'patch' => null,
'extra' => null,
'native' => $serverInfo,
);
}
}
return $serverInfo;
}
/**
* Checks if there's a sequence that exists.
*
* @param string $seq_name The sequence name to verify.
* @return boolean The value if the table exists or not
*/
public function checkSequence($seqName)
{
$query = 'SELECT * FROM ' . $seqName;
try {
$this->exec($query);
} catch(Doctrine_Connection_Exception $e) {
if ($e->getPortableCode() == Doctrine::ERR_NOSUCHTABLE) {
return false;
}
throw $e;
}
return true;
}
}
lib/Doctrine/Connection/Sqlite.php
View file @ 65ebec5a
......@@ -74,7 +74,7 @@ class Doctrine_Connection_Sqlite extends Doctrine_Connection_Common
$this->options['server_version'] = '';
*/
parent::__construct($manager, $adapter);
$this->initFunctions();
//$this->initFunctions();
}
/**
* initializes database functions missing in sqlite
......
lib/Doctrine/Export.php
View file @ 65ebec5a
......@@ -144,7 +144,7 @@ class Doctrine_Export extends Doctrine_Connection_Module
}
$queryFields = $this->getFieldDeclarationList($fields);
if (!empty($options['primary'])) {
if (isset($options['primary']) && ! empty($options['primary'])) {
$queryFields.= ', PRIMARY KEY('.implode(', ', array_values($options['primary'])).')';
}
......
lib/Doctrine/Export/Mysql.php
View file @ 65ebec5a
......@@ -101,7 +101,7 @@ class Doctrine_Export_Mysql extends Doctrine_Export
}
$query_fields = $this->getFieldDeclarationList($fields);
if ( ! empty($options['primary'])) {
if (isset($options['primary']) && ! empty($options['primary'])) {
$query_fields.= ', PRIMARY KEY(' . implode(', ', array_values($options['primary'])) . ')';
}
$name = $this->conn->quoteIdentifier($name, true);
......@@ -110,12 +110,12 @@ class Doctrine_Export_Mysql extends Doctrine_Export
$optionStrings = array();
if (isset($options['comment'])) {
$optionStrings['comment'] = 'COMMENT = '.$this->dbh->quote($options['comment'], 'text');
$optionStrings['comment'] = 'COMMENT = ' . $this->dbh->quote($options['comment'], 'text');
}
if (isset($options['charset'])) {
$optionsSting['charset'] = 'DEFAULT CHARACTER SET '.$options['charset'];
$optionsSting['charset'] = 'DEFAULT CHARACTER SET ' . $options['charset'];
if (isset($options['collate'])) {
$optionStrings['charset'].= ' COLLATE '.$options['collate'];
$optionStrings['charset'].= ' COLLATE ' . $options['collate'];
}
}
......
lib/Doctrine/Export/Sqlite.php
View file @ 65ebec5a
......@@ -89,6 +89,62 @@ class Doctrine_Export_Sqlite extends Doctrine_Export
return $this->conn->exec($query);
}
/**
* create a new table
*
* @param string $name Name of the database that should be created
* @param array $fields Associative array that contains the definition of each field of the new table
* The indexes of the array entries are the names of the fields of the table an
* the array entry values are associative arrays like those that are meant to be
* passed with the field definitions to get[Type]Declaration() functions.
* array(
* 'id' => array(
* 'type' => 'integer',
* 'unsigned' => 1
* 'notnull' => 1
* 'default' => 0
* ),
* 'name' => array(
* 'type' => 'text',
* 'length' => 12
* ),
* 'password' => array(
* 'type' => 'text',
* 'length' => 12
* )
* );
* @param array $options An associative array of table options:
*
* @return void
*/
public function createTable($name, array $fields, array $options = array())
{
if ( ! $name) {
throw new Doctrine_Export_Exception('no valid table name specified');
}
if (empty($fields)) {
throw new Doctrine_Export_Exception('no fields specified for table '.$name);
}
$queryFields = $this->getFieldDeclarationList($fields);
$autoinc = false;
foreach($fields as $field) {
if(isset($field['autoincrement']) && $field['autoincrement']) {
$autoinc = true;
break;
}
}
if ( ! $autoinc && isset($options['primary']) && ! empty($options['primary'])) {
$queryFields.= ', PRIMARY KEY('.implode(', ', array_values($options['primary'])).')';
}
$name = $this->conn->quoteIdentifier($name, true);
$query = 'CREATE TABLE ' . $name . ' (' . $queryFields . ')';
return $this->conn->exec($query);
}
/**
* create sequence
*
......
lib/Doctrine/Record.php
View file @ 65ebec5a
......@@ -1445,10 +1445,25 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
{
$this->_table->setEnumValues($column, $values);
}
/**
* option
* sets or retrieves an option
*
* @see Doctrine_Table::$options availible options
* @param mixed $name
* @param mixed $value
* @return mixed
*/
public function option($name, $value = null)
{
if ($value == null) {
$this->_table->getOption($name);
if (is_array($name)) {
foreach ($name as $k => $v) {
$this->_table->setOption($k, $v);
}
} else {
return $this->_table->getOption($name);
}
} else {
$this->_table->setOption($name, $value);
}
......
lib/Doctrine/Table.php
View file @ 65ebec5a
......@@ -117,6 +117,10 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
*
* -- name name of the component, for example component name of the GroupTable is 'Group'
*
* -- declaringClass name of the table definition declaring class (when using inheritance the class
* that defines the table structure can be any class in the inheritance hierarchy,
* hence we need reflection to check out which class actually calls setTableDefinition)
*
* -- tableName database table name, in most cases this is the same as component name but in some cases
* where one-table-multi-class inheritance is used this will be the name of the inherited table
*
......@@ -183,6 +187,8 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
$method = new ReflectionMethod($this->options['name'], 'setTableDefinition');
$class = $method->getDeclaringClass();
$this->options['declaringClass'] = $class;
if ( ! isset($this->options['tableName'])) {
$this->options['tableName'] = Doctrine::tableize($class->getName());
}
......@@ -247,9 +253,42 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
};
if ($this->getAttribute(Doctrine::ATTR_CREATE_TABLES)) {
if (Doctrine::isValidClassname($class->getName())) {
$this->export();
}
}
} else {
throw new Doctrine_Table_Exception("Class '$name' has no table definition.");
}
$record->setUp();
// save parents
array_pop($names);
$this->parents = $names;
$this->query = "SELECT ".implode(", ",array_keys($this->columns))." FROM ".$this->getTableName();
// check if an instance of this table is already initialized
if ( ! $this->conn->addTable($this)) {
throw new Doctrine_Table_Exception();
}
$this->repository = new Doctrine_Table_Repository($this);
}
/**
* export
* exports this table to database based on column and option definitions
*
* @throws Doctrine_Connection_Exception if some error other than Doctrine::ERR_ALREADY_EXISTS
* occurred during the create table operation
* @return boolean whether or not the export operation was successful
* false if table already existed in the database
*/
public function export() {
if (Doctrine::isValidClassname($this->options['declaringClass']->getName())) {
try {
$columns = array();
$primary = array();
foreach ($this->columns as $name => $column) {
$definition = $column[2];
$definition['type'] = $column[0];
......@@ -262,33 +301,21 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
$definition['default'] = (int) $definition['default'];
}
$columns[$name] = $definition;
}
$this->conn->export->createTable($this->options['tableName'], $columns);
} catch(Exception $e) {
if(isset($definition['primary']) && $definition['primary']) {
$primary[] = $name;
}
}
}
$options['primary'] = $primary;
$this->conn->export->createTable($this->options['tableName'], $columns, array_merge($this->options, $options));
} catch(Doctrine_Connection_Exception $e) {
// we only want to silence table already exists errors
if($e->getPortableCode !== Doctrine::ERR_ALREADY_EXISTS) {
throw $e;
}
} else {
throw new Doctrine_Table_Exception("Class '$name' has no table definition.");
}
$record->setUp();
// save parents
array_pop($names);
$this->parents = $names;
$this->query = "SELECT ".implode(", ",array_keys($this->columns))." FROM ".$this->getTableName();
// check if an instance of this table is already initialized
if ( ! $this->conn->addTable($this)) {
throw new Doctrine_Table_Exception();
}
$this->repository = new Doctrine_Table_Repository($this);
}
/**
* createQuery
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment