From 8b375c3580cf0d36d9d2571ce61b68d2e9f72962 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Mon, 9 Dec 2013 23:11:56 -0500 Subject: [PATCH] clean up oci driver. --- framework/yii/db/oci/ColumnSchema.php | 92 ------- framework/yii/db/oci/QueryBuilder.php | 179 +++++++----- framework/yii/db/oci/Schema.php | 493 ++++++++++++++-------------------- 3 files changed, 320 insertions(+), 444 deletions(-) delete mode 100644 framework/yii/db/oci/ColumnSchema.php diff --git a/framework/yii/db/oci/ColumnSchema.php b/framework/yii/db/oci/ColumnSchema.php deleted file mode 100644 index 9436c78..0000000 --- a/framework/yii/db/oci/ColumnSchema.php +++ /dev/null @@ -1,92 +0,0 @@ -dbType = $dbType; - $this->extractType($dbType); - $this->extractLimit($dbType); - if ($defaultValue !== null) - $this->extractDefault($defaultValue); - } - - /** - * Extracts the PHP type from DB type. - * - * @param string $dbType - * DB type - * @return string - */ - protected function extractOraType($dbType) - { - if (strpos($dbType, 'FLOAT') !== false) - return 'double'; - - if (strpos($dbType, 'NUMBER') !== false || strpos($dbType, 'INTEGER') !== false) { - if (strpos($dbType, '(') && preg_match('/\((.*)\)/', $dbType, $matches)) { - $values = explode(',', $matches[1]); - if (isset($values[1]) and (((int) $values[1]) > 0)) - return 'double'; - else - return 'integer'; - } else - return 'double'; - } else - return 'string'; - } - - /** - * Extracts the PHP type from DB type. - * - * @param string $dbType - * DB type - */ - protected function extractType($dbType) - { - $this->type = $this->extractOraType($dbType); - } - - /** - * Extracts size, precision and scale information from column's DB type. - * - * @param string $dbType - * the column's DB type - */ - protected function extractLimit($dbType) - { - if (strpos($dbType, '(') && preg_match('/\((.*)\)/', $dbType, $matches)) { - $values = explode(',', $matches[1]); - $this->size = $this->precision = (int) $values[0]; - if (isset($values[1])) - $this->scale = (int) $values[1]; - } - } - - /** - * Extracts the default value for the column. - * The value is typecasted to correct PHP type. - * - * @param mixed $defaultValue - * the default value obtained from metadata - */ - protected function extractDefault($defaultValue) - { - if (stripos($defaultValue, 'timestamp') !== false) { - $this->defaultValue = null; - } else { - $this->defaultValue = $this->typecast($defaultValue); - } - } -} diff --git a/framework/yii/db/oci/QueryBuilder.php b/framework/yii/db/oci/QueryBuilder.php index ac3aebb..cf618e0 100644 --- a/framework/yii/db/oci/QueryBuilder.php +++ b/framework/yii/db/oci/QueryBuilder.php @@ -1,78 +1,137 @@ params; - $clauses = [ - $this->buildSelect ( $query->select, $query->distinct, $query->selectOption ), - $this->buildFrom ( $query->from ), - $this->buildJoin ( $query->join, $params ), - $this->buildWhere ( $query->where, $params ), - $this->buildGroupBy ( $query->groupBy ), - $this->buildHaving ( $query->having, $params ), - $this->buildUnion ( $query->union, $params ), - $this->buildOrderBy ( $query->orderBy ) - // $this->buildLimit($query->limit, $query->offset), - - ; - // var_dump( [implode($this->separator, array_filter($clauses)), $params]);exit; - $this->sql = implode($this->separator, array_filter($clauses)); - - if (! is_null($query->limit) && ! is_null($query->offset)) { - $this->sql = $this->buildLimit($query->limit, $query->offset); - } - return [ - $this->sql, - $params - ]; - // return [implode($this->separator, array_filter($clauses)), $params]; - } - - public function buildLimit($limit, $offset) - { - // var_dump($limit >= 0); - // var_dump($offset);exit; - // var_dump($limit, $offset); - if (($limit < 0) && ($offset < 0)) { - return $this->sql; - } - $filters = array(); - if ($offset > 0) { - $filters[] = 'rowNumId > ' . (int) $offset; - } - - if ($limit >= 0) { - $filters[] = 'rownum <= ' . (int) $limit; - } - - if (count($filters) > 0) { - $filter = implode(' and ', $filters); - $filter = " WHERE " . $filter; - } else { - $filter = ''; - } - - $sql = <<params; + $clauses = [ + $this->buildSelect($query->select, $query->distinct, $query->selectOption), + $this->buildFrom($query->from), + $this->buildJoin($query->join, $params), + $this->buildWhere($query->where, $params), + $this->buildGroupBy($query->groupBy), + $this->buildHaving($query->having, $params), + $this->buildUnion($query->union, $params), + $this->buildOrderBy($query->orderBy), + ]; + $this->sql = implode($this->separator, array_filter($clauses)); + + if ($query->limit !== null || $query->offset !== null) { + $this->sql = $this->buildLimit($query->limit, $query->offset); + } + return [$this->sql, $params]; + } + + public function buildLimit($limit, $offset) + { + if (($limit < 0) && ($offset < 0)) { + return $this->sql; + } + $filters = array(); + if ($offset > 0) { + $filters[] = 'rowNumId > ' . (int)$offset; + } + + if ($limit >= 0) { + $filters[] = 'rownum <= ' . (int)$limit; + } + + if (count($filters) > 0) { + $filter = implode(' and ', $filters); + $filter = " WHERE " . $filter; + } else { + $filter = ''; + } + + $sql = <<sql}), PAGINATION AS (SELECT USER_SQL.*, rownum as rowNumId FROM USER_SQL) SELECT * FROM PAGINATION {$filter} EOD; - return $sql; - } + return $sql; + } + + + /** + * Builds a SQL statement for renaming a DB table. + * + * @param string $table the table to be renamed. The name will be properly quoted by the method. + * @param string $newName the new table name. The name will be properly quoted by the method. + * @return string the SQL statement for renaming a DB table. + */ + public function renameTable($table, $newName) + { + return 'ALTER TABLE ' . $this->db->quoteTableName($table) . ' RENAME TO ' . $this->db->quoteTableName($newName); + } + + /** + * Builds a SQL statement for changing the definition of a column. + * + * @param string $table the table whose column is to be changed. The table name will be properly quoted by the method. + * @param string $column the name of the column to be changed. The name will be properly quoted by the method. + * @param string $type the new column type. The {@link getColumnType} method will be invoked to convert abstract column type (if any) + * into the physical one. Anything that is not recognized as abstract type will be kept in the generated SQL. + * For example, 'string' will be turned into 'varchar(255)', while 'string not null' will become 'varchar(255) not null'. + * @return string the SQL statement for changing the definition of a column. + */ + public function alterColumn($table, $column, $type) + { + $type = $this->getColumnType($type); + return 'ALTER TABLE ' . $this->db->quoteTableName($table) . ' MODIFY ' . $this->db->quoteColumnName($column) . ' ' . $this->getColumnType($type); + } + + /** + * Builds a SQL statement for dropping an index. + * + * @param string $name the name of the index to be dropped. The name will be properly quoted by the method. + * @param string $table the table whose index is to be dropped. The name will be properly quoted by the method. + * @return string the SQL statement for dropping an index. + */ + public function dropIndex($name, $table) + { + return 'DROP INDEX ' . $this->db->quoteTableName($name); + } + + /** + * @inheritdoc + */ + public function resetSequence($table, $value = null) + { + $tableSchema = $this->db->getTableSchema($table); + if ($tableSchema === null) { + throw new InvalidParamException("Unknown table: $table"); + } + if ($tableSchema->sequenceName === null) { + return ''; + } + + if ($value !== null) { + $value = (int)$value; + } else { + $value = (int)$this->db->createCommand("SELECT MAX(\"{$tableSchema->primaryKey}\") FROM \"{$tableSchema->name}\"")->queryScalar(); + $value++; + } + return "DROP SEQUENCE \"{$tableSchema->name}_SEQ\";" + . "CREATE SEQUENCE \"{$tableSchema->name}_SEQ\" START WITH {$value} INCREMENT BY 1 NOMAXVALUE NOCACHE"; + } } diff --git a/framework/yii/db/oci/Schema.php b/framework/yii/db/oci/Schema.php index 2830faf..40ddd04 100644 --- a/framework/yii/db/oci/Schema.php +++ b/framework/yii/db/oci/Schema.php @@ -1,137 +1,115 @@ + * @since 2.0 */ - class Schema extends \yii\db\Schema { + private $_defaultSchema; - private $_defaultSchema = ''; - - public function createQueryBuilder() - { - return new QueryBuilder($this->db); - } - - public function quoteTableName($name) - { - if (strpos($name, '.') === false) { - return $this->quoteSimpleTableName($name); - } - $parts = explode('.', $name); - foreach ($parts as $i => $part) { - $parts[$i] = $this->quoteSimpleTableName($part); - } - return implode('.', $parts); - } + /** + * @inheritdoc + */ + public function quoteSimpleTableName($name) + { + return '"' . $name . '"'; + } - public function quoteSimpleTableName($name) - { - return '"' . $name . '"'; - // return $name; - } + /** + * @inheritdoc + */ + public function quoteSimpleColumnName($name) + { + return '"' . $name . '"'; + } - public function quoteColumnName($name) - { - if (($pos = strrpos($name, '.')) !== false) { - $prefix = $this->quoteTableName(substr($name, 0, $pos)) . '.'; - $name = substr($name, $pos + 1); - } else { - $prefix = ''; - } - return $prefix . ($name === '*' ? $name : $this->quoteSimpleColumnName($name)); - } + /** + * @inheritdoc + */ + public function createQueryBuilder() + { + return new QueryBuilder($this->db); + } - public function quoteSimpleColumnName($name) - { - return '"' . $name . '"'; - // return $name; - } + /** + * @inheritdoc + */ + public function loadTableSchema($name) + { + $table = new TableSchema(); + $this->resolveTableNames($table, $name); - public function loadTableSchema($name) - { - $table = new TableSchema(); - $this->resolveTableNames($table, $name); - // $this->findPrimaryKeys($table); - if ($this->findColumns($table)) { - // $this->findForeignKeys($table); - $this->findConstraints($table); - return $table; - } - } + if ($this->findColumns($table)) { + $this->findConstraints($table); + return $table; + } else { + return null; + } + } - /** - * Resolves the table name and schema name (if any). - * - * @param TableSchema $table - * the table metadata object - * @param string $name - * the table name - */ - protected function resolveTableNames($table, $name) - { - $parts = explode('.', str_replace('"', '', $name)); - if (isset($parts[1])) { - $table->schemaName = $parts[0]; - $table->name = $parts[1]; - } else { - $table->name = $parts[0]; - } - - if ($table->schemaName === null) { - $table->schemaName = $this->getDefaultSchema(); - } - } + /** + * Resolves the table name and schema name (if any). + * + * @param TableSchema $table the table metadata object + * @param string $name the table name + */ + protected function resolveTableNames($table, $name) + { + $parts = explode('.', str_replace('"', '', $name)); + if (isset($parts[1])) { + $table->schemaName = $parts[0]; + $table->name = $parts[1]; + } else { + $table->schemaName = $this->getDefaultSchema(); + $table->name = $parts[0]; + } + } - /** - * - * @return string default schema. - */ - public function getDefaultSchema() - { - if (! strlen($this->_defaultSchema)) { - $this->setDefaultSchema(strtoupper($this->db->username)); - } - - return $this->_defaultSchema; - } + /** + * @return string default schema. + */ + public function getDefaultSchema() + { + if ($this->_defaultSchema === null) { + $this->setDefaultSchema(strtoupper($this->db->username)); + } + return $this->_defaultSchema; + } - /** - * - * @param string $schema - * default schema. - */ - public function setDefaultSchema($schema) - { - $this->_defaultSchema = $schema; - } + /** + * @param string $schema default schema. + */ + public function setDefaultSchema($schema) + { + $this->_defaultSchema = $schema; + } - public function getLastInsertID($sequenceName = '') - { - if ($this->db->isActive) { - $sql = "select {$sequenceName}.currval from dual"; - return $this->db->createCommand($sql)->queryScalar(); - } else { - throw new InvalidCallException('DB Connection is not active.'); - } - } + /** + * Collects the table column metadata. + * @param TableSchema $table the table schema + * @return boolean whether the table exists + */ + protected function findColumns($table) + { + $schemaName = $table->schemaName; + $tableName = $table->name; - /** - * Collects the table column metadata. - * - */ - protected function findColumns($table) - { - $schemaName = $table->schemaName; - $tableName = $table->name; - - $sql = <<db->createCommand($sql)->queryAll(); - } catch (\Exception $e) { - return false; - } - - foreach ($columns as $column) { - $c = $this->createColumn($column); - - $table->columns[$c->name] = $c; - if ($c->isPrimaryKey) { - if ($table->primaryKey === null) { - $table->primaryKey = $c->name; - } elseif (is_string($table->primaryKey)) { - $table->primaryKey = array( - $table->primaryKey, - $c->name - ); - } else { - $table->primaryKey[] = $c->name; - } - $sql = "select sequence_name -from user_tables tabs -join user_triggers trigs - on trigs.table_name = tabs.table_name -join user_dependencies deps - on deps.name = trigs.trigger_name -join user_sequences seqs - on seqs.sequence_name = deps.referenced_name -where tabs.table_name = '{$tableName}' - and trigs.triggering_event = 'INSERT'"; - try { - $seqName = $this->db->createCommand($sql)->queryScalar(); - } catch (\Exception $e) { - return false; - } - $table->sequenceName = $seqName; - $c->autoIncrement = true; - } - } - return true; - } - protected function createColumn($column) - { - $c = new ColumnSchema(); - $c->name = $column['COLUMN_NAME']; - $c->allowNull = $column['NULLABLE'] === 'Y'; - $c->isPrimaryKey = strpos($column['KEY'], 'P') !== false; - $c->extract($column['DATA_TYPE'], $column['DATA_DEFAULT']); - $c->comment = $column['COLUMN_COMMENT'] === null ? '' : $column['COLUMN_COMMENT']; - - return $c; - } + try { + $columns = $this->db->createCommand($sql)->queryAll(); + } catch (\Exception $e) { + return false; + } + + foreach ($columns as $column) { + $c = $this->createColumn($column); + $table->columns[$c->name] = $c; + if ($c->isPrimaryKey) { + $table->primaryKey[] = $c->name; + $table->sequenceName = ''; + $c->autoIncrement = true; + } + } + return true; + } + + protected function createColumn($column) + { + $c = new ColumnSchema(); + $c->name = $column['COLUMN_NAME']; + $c->allowNull = $column['NULLABLE'] === 'Y'; + $c->isPrimaryKey = strpos($column['KEY'], 'P') !== false; + $c->comment = $column['COLUMN_COMMENT'] === null ? '' : $column['COLUMN_COMMENT']; + + $this->extractColumnType($c, $column['DATA_TYPE']); + $this->extractColumnSize($c, $column['DATA_TYPE']); + + if (stripos($column['DATA_DEFAULT'], 'timestamp') !== false) { + $c->defaultValue = null; + } else { + $c->defaultValue = $c->typecast($column['DATA_DEFAULT']); + } + + return $c; + } - protected function findConstraints($table) - { - $sql = << 'P' order by d.constraint_name, c.position EOD; - $command = $this->db->createCommand($sql); - foreach ($command->queryAll() as $row) { - if ($row['CONSTRAINT_TYPE'] === 'R') { // foreign key - $name = $row["COLUMN_NAME"]; - $table->foreignKeys[$name] = array( - $row["TABLE_REF"], - $row["COLUMN_REF"] - ); - /* - * if (isset($table->columns[$name])) { $table->columns[$name]->isForeignKey = true; } - */ - } - } - } + $command = $this->db->createCommand($sql); + foreach ($command->queryAll() as $row) { + if ($row['CONSTRAINT_TYPE'] === 'R') { + $name = $row["COLUMN_NAME"]; + $table->foreignKeys[$name] = [$row["TABLE_REF"], $row["COLUMN_REF"]]; + } + } + } - /** - * Returns all table names in the database. - * - * @param string $schema - * the schema of the tables. Defaults to empty string, meaning the current or default schema. - * If not empty, the returned table names will be prefixed with the schema name. - * @return array all table names in the database. - */ - protected function findTableNames($schema = '') - { - if ($schema === '') { - $sql = <<db->createCommand($sql); - } else { - $sql = <<db->createCommand($sql); + } else { + $sql = <<db > createCommand($sql); - $command->bindParam(':schema', $schema); - } - - $rows = $command->queryAll(); - $names = array(); - foreach ($rows as $row) { - if ($schema === $this->getDefaultSchema() || $schema === '') { - $names[] = $row['TABLE_NAME']; - } else { - $names[] = $row['TABLE_SCHEMA'] . '.' . $row['TABLE_NAME']; - } - } - return $names; - } + $command = $this->db->createCommand($sql); + $command->bindParam(':schema', $schema); + } - /** - * Builds a SQL statement for renaming a DB table. - * - * @param string $table - * the table to be renamed. The name will be properly quoted by the method. - * @param string $newName - * the new table name. The name will be properly quoted by the method. - * @return string the SQL statement for renaming a DB table. - * @since 1.1.6 - */ - public function renameTable($table, $newName) - { - return 'ALTER TABLE ' . $this->quoteTableName($table) . ' RENAME TO ' . $this->quoteTableName($newName); - } + $rows = $command->queryAll(); + $names = array(); + foreach ($rows as $row) { + $names[] = $row['TABLE_NAME']; + } + return $names; + } - /** - * Builds a SQL statement for changing the definition of a column. - * - * @param string $table - * the table whose column is to be changed. The table name will be properly quoted by the method. - * @param string $column - * the name of the column to be changed. The name will be properly quoted by the method. - * @param string $type - * the new column type. The {@link getColumnType} method will be invoked to convert abstract column type (if any) - * into the physical one. Anything that is not recognized as abstract type will be kept in the generated SQL. - * For example, 'string' will be turned into 'varchar(255)', while 'string not null' will become 'varchar(255) not null'. - * @return string the SQL statement for changing the definition of a column. - * @since 1.1.6 - */ - public function alterColumn($table, $column, $type) - { - $type = $this->getColumnType($type); - $sql = 'ALTER TABLE ' . $this->quoteTableName($table) . ' MODIFY ' . $this->quoteColumnName($column) . ' ' . $this->getColumnType($type); - return $sql; - } + /** + * Extracts the data types for the given column + * @param ColumnSchema $column + * @param string $dbType DB type + */ + protected function extractColumnType($column, $dbType) + { + $column->dbType = $dbType; - /** - * Builds a SQL statement for dropping an index. - * - * @param string $name - * the name of the index to be dropped. The name will be properly quoted by the method. - * @param string $table - * the table whose index is to be dropped. The name will be properly quoted by the method. - * @return string the SQL statement for dropping an index. - * @since 1.1.6 - */ - public function dropIndex($name, $table) - { - return 'DROP INDEX ' . $this->quoteTableName($name); - } + if (strpos($dbType, 'FLOAT') !== false) { + $column->type = 'double'; + } elseif (strpos($dbType, 'NUMBER') !== false || strpos($dbType, 'INTEGER') !== false) { + if (strpos($dbType, '(') && preg_match('/\((.*)\)/', $dbType, $matches)) { + $values = explode(',', $matches[1]); + if (isset($values[1]) and (((int)$values[1]) > 0)) { + $column->type = 'double'; + } else { + $column->type = 'integer'; + } + } else { + $column->type = 'double'; + } + } else { + $column->type = 'string'; + } + } - /** - * Resets the sequence value of a table's primary key. - * The sequence will be reset such that the primary key of the next new row inserted - * will have the specified value or 1. - * - * @param CDbTableSchema $table - * the table schema whose primary key sequence will be reset - * @param mixed $value - * the value for the primary key of the next new row inserted. If this is not set, - * the next new row's primary key will have a value 1. - * @since 1.1.13 - */ - public function resetSequence($table, $value = 1) - { - $seq = $table->name . "_SEQ"; - if ($table->sequenceName !== null) { - $this->db->createCommand("DROP SEQUENCE " . $seq)->execute(); - - $createSequenceSql = <<< SQL -create sequence $seq -start with $value -increment by 1 -nomaxvalue -nocache -SQL; - $this->db->createCommand($createSequenceSql)->execute(); - } - } + /** + * Extracts size, precision and scale information from column's DB type. + * @param ColumnSchema $column + * @param string $dbType the column's DB type + */ + protected function extractColumnSize($column, $dbType) + { + if (strpos($dbType, '(') && preg_match('/\((.*)\)/', $dbType, $matches)) { + $values = explode(',', $matches[1]); + $column->size = $column->precision = (int)$values[0]; + if (isset($values[1])) { + $column->scale = (int)$values[1]; + } + } + } }