clean up oci driver.

framework/yii/db/oci/ColumnSchema.php

@@ -1,92 +0,0 @@
-<?php
-namespace yii\db\oci;
-
-class ColumnSchema extends \yii\db\ColumnSchema
-{
-
-    /**
-     * Initializes the column with its DB type and default value.
-     * This sets up the column's PHP type, size, precision, scale as well as default value.
-     * 
-     * @param string $dbType
-     *            the column's DB type
-     * @param mixed $defaultValue
-     *            the default value
-     */
-    public function extract($dbType, $defaultValue)
-    {
-        $this->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);
-        }
-    }
-}

framework/yii/db/oci/QueryBuilder.php

@@ -1,7 +1,12 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
 namespace yii\db\oci;
 
-use yii\db\Exception;
 use yii\base\InvalidParamException;
 
 /**
@@ -25,28 +30,18 @@ class QueryBuilder extends \yii\db\QueryBuilder
 			$this->buildGroupBy($query->groupBy),
 			$this->buildHaving($query->having, $params),
 			$this->buildUnion($query->union, $params),
-				$this->buildOrderBy ( $query->orderBy ) 
+			$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)) {
+		if ($query->limit !== null || $query->offset !== null) {
 			$this->sql = $this->buildLimit($query->limit, $query->offset);
 		}
-        return [
+		return [$this->sql, $params];
-            $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;
 		}
@@ -75,4 +70,68 @@ FROM PAGINATION
 EOD;
 		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";
+	}
 }

framework/yii/db/oci/Schema.php

@@ -1,78 +1,72 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
 namespace yii\db\oci;
 
 use yii\db\TableSchema;
-use yii\db\oci\ColumnSchema;
+use yii\db\ColumnSchema;
 
 /**
- * Schema is the class for retrieving metadata information from an Oracle database.
+ * Schema is the class for retrieving metadata from an Oracle database
  *
+ * @todo mapping from physical types to abstract types
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
  */
-
 class Schema extends \yii\db\Schema
 {
+	private $_defaultSchema;
 
-    private $_defaultSchema = '';
+	/**
-
+	 * @inheritdoc
-    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);
-    }
-
 	public function quoteSimpleTableName($name)
 	{
 		return '"' . $name . '"';
-        // return $name;
 	}
 
-    public function quoteColumnName($name)
+	/**
+	 * @inheritdoc
+	 */
+	public function quoteSimpleColumnName($name)
 	{
-        if (($pos = strrpos($name, '.')) !== false) {
+		return '"' . $name . '"';
-            $prefix = $this->quoteTableName(substr($name, 0, $pos)) . '.';
-            $name = substr($name, $pos + 1);
-        } else {
-            $prefix = '';
-        }
-        return $prefix . ($name === '*' ? $name : $this->quoteSimpleColumnName($name));
 	}
 
-    public function quoteSimpleColumnName($name)
+	/**
+	 * @inheritdoc
+	 */
+	public function createQueryBuilder()
 	{
-        return '"' . $name . '"';
+		return new QueryBuilder($this->db);
-        // return $name;
 	}
 
+	/**
+	 * @inheritdoc
+	 */
 	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;
+		} else {
+			return null;
 		}
 	}
 
 	/**
 	 * Resolves the table name and schema name (if any).
 	 *
-     * @param TableSchema $table
+	 * @param TableSchema $table the table metadata object
-     *            the table metadata object
+	 * @param string $name the table name
-     * @param string $name
-     *            the table name
 	 */
 	protected function resolveTableNames($table, $name)
 	{
@@ -81,50 +75,34 @@ class Schema extends \yii\db\Schema
 			$table->schemaName = $parts[0];
 			$table->name = $parts[1];
 		} else {
-            $table->name = $parts[0];
-        }
-        
-        if ($table->schemaName === null) {
 			$table->schemaName = $this->getDefaultSchema();
+			$table->name = $parts[0];
 		}
 	}
 
 	/**
-     *
 	 * @return string default schema.
 	 */
 	public function getDefaultSchema()
 	{
-        if (! strlen($this->_defaultSchema)) {
+		if ($this->_defaultSchema === null) {
 			$this->setDefaultSchema(strtoupper($this->db->username));
 		}
-        
 		return $this->_defaultSchema;
 	}
 
 	/**
-     *
+	 * @param string $schema default 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)
 	{
@@ -169,35 +147,10 @@ EOD;
 
 		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;
-                }
+				$table->sequenceName = '';
-                $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;
 			}
 		}
@@ -210,9 +163,17 @@ where tabs.table_name = '{$tableName}'
 		$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'];
 
+		$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;
 	}
 
@@ -233,26 +194,15 @@ where tabs.table_name = '{$tableName}'
 EOD;
 		$command = $this->db->createCommand($sql);
 		foreach ($command->queryAll() as $row) {
-            if ($row['CONSTRAINT_TYPE'] === 'R') { // foreign key
+			if ($row['CONSTRAINT_TYPE'] === 'R') {
 				$name = $row["COLUMN_NAME"];
-                $table->foreignKeys[$name] = array(
+				$table->foreignKeys[$name] = [$row["TABLE_REF"], $row["COLUMN_REF"]];
-                    $row["TABLE_REF"],
-                    $row["COLUMN_REF"]
-                );
-                /*
-                 * if (isset($table->columns[$name])) { $table->columns[$name]->isForeignKey = true; }
-                 */
 			}
 		}
 	}
 
 	/**
-     * Returns all table names in the database.
+	 * @inheritdoc
-     * 
-     * @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 = '')
 	{
@@ -266,99 +216,58 @@ EOD;
 SELECT object_name as table_name, owner as table_schema FROM all_objects
 WHERE object_type = 'TABLE' AND owner=:schema
 EOD;
-            $command = $this->db > createCommand($sql);
+			$command = $this->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;
 	}
 
 	/**
-     * Builds a SQL statement for renaming a DB table.
+	 * Extracts the data types for the given column
-     * 
+	 * @param ColumnSchema $column
-     * @param string $table
+	 * @param string $dbType DB type
-     *            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)
+	protected function extractColumnType($column, $dbType)
 	{
-        return 'ALTER TABLE ' . $this->quoteTableName($table) . ' RENAME TO ' . $this->quoteTableName($newName);
+		$column->dbType = $dbType;
-    }
 
-    /**
+		if (strpos($dbType, 'FLOAT') !== false) {
-     * Builds a SQL statement for changing the definition of a column.
+			$column->type = 'double';
-     * 
+		} elseif (strpos($dbType, 'NUMBER') !== false || strpos($dbType, 'INTEGER') !== false) {
-     * @param string $table
+			if (strpos($dbType, '(') && preg_match('/\((.*)\)/', $dbType, $matches)) {
-     *            the table whose column is to be changed. The table name will be properly quoted by the method.
+				$values = explode(',', $matches[1]);
-     * @param string $column
+				if (isset($values[1]) and (((int)$values[1]) > 0)) {
-     *            the name of the column to be changed. The name will be properly quoted by the method.
+					$column->type = 'double';
-     * @param string $type
+				} else {
-     *            the new column type. The {@link getColumnType} method will be invoked to convert abstract column type (if any)
+					$column->type = 'integer';
-     *            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'.
+			} else {
-     * @return string the SQL statement for changing the definition of a column.
+				$column->type = 'double';
-     * @since 1.1.6
+			}
-     */
+		} else {
-    public function alterColumn($table, $column, $type)
+			$column->type = 'string';
-    {
-        $type = $this->getColumnType($type);
-        $sql = 'ALTER TABLE ' . $this->quoteTableName($table) . ' MODIFY ' . $this->quoteColumnName($column) . ' ' . $this->getColumnType($type);
-        return $sql;
 		}
-
-    /**
-     * 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);
 	}
 
 	/**
-     * Resets the sequence value of a table's primary key.
+	 * Extracts size, precision and scale information from column's DB type.
-     * The sequence will be reset such that the primary key of the next new row inserted
+	 * @param ColumnSchema $column
-     * will have the specified value or 1.
+	 * @param string $dbType the column's DB type
-     * 
-     * @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)
+	protected function extractColumnSize($column, $dbType)
 	{
-        $seq = $table->name . "_SEQ";
+		if (strpos($dbType, '(') && preg_match('/\((.*)\)/', $dbType, $matches)) {
-        if ($table->sequenceName !== null) {
+			$values = explode(',', $matches[1]);
-            $this->db->createCommand("DROP SEQUENCE " . $seq)->execute();
+			$column->size = $column->precision = (int)$values[0];
-            
+			if (isset($values[1])) {
-            $createSequenceSql = <<< SQL
+				$column->scale = (int)$values[1];
-create sequence $seq
+			}
-start with $value
-increment by 1
-nomaxvalue
-nocache
-SQL;
-            $this->db->createCommand($createSequenceSql)->execute();
 		}
 	}
 }