diff --git a/lib/Doctrine.php b/lib/Doctrine.php
index b1e45458d..588c9ff79 100644
--- a/lib/Doctrine.php
+++ b/lib/Doctrine.php
@@ -529,8 +529,9 @@ final class Doctrine
      */
     public static function isValidClassname($classname)
     {
-        if (preg_match('~(^[a-z])|(_[a-z])|([\W])|(_{2})~', $classname))
+        if (preg_match('~(^[a-z])|(_[a-z])|([\W])|(_{2})~', $classname)) {
             return false;
+        }    
 
         return true;
     }
diff --git a/lib/Doctrine/Import/Oracle.php b/lib/Doctrine/Import/Oracle.php
index 3c657566c..7107fac07 100644
--- a/lib/Doctrine/Import/Oracle.php
+++ b/lib/Doctrine/Import/Oracle.php
@@ -126,7 +126,7 @@ class Doctrine_Import_Oracle extends Doctrine_Import
 
             $descr[$val['column_name']] = array(
                'name'       => $val['column_name'],
-               'notnull'    => (bool) ($val['nullable'] === 'N'), // nullable is N when mandatory
+               'notnull'    => (bool) ($val['nullable'] === 'N'),
                'type'       => $val['data_type'],
                'ptype'      => $decl['type'],
                'fixed'      => $decl['fixed'],
diff --git a/lib/Doctrine/Query.php b/lib/Doctrine/Query.php
index 14dfff43c..072aaba70 100644
--- a/lib/Doctrine/Query.php
+++ b/lib/Doctrine/Query.php
@@ -47,6 +47,14 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
      * constant for UPDATE queries
      */
     const UPDATE = 2;
+    /**
+     * constant for INSERT queries
+     */
+    const INSERT = 3;
+    /**
+     * constant for CREATE queries
+     */
+    const CREATE = 4;
     /**
      * @param array $subqueryAliases        the table aliases needed in some LIMIT subqueries
      */
@@ -957,8 +965,14 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
         $parts = $this->splitQuery($query);
 
         foreach($parts as $k => $part) {
-            $part = implode(" ",$part);
+            $part = implode(' ', $part);
             switch(strtoupper($k)) {
+                case 'CREATE':
+                    $this->type = self::CREATE;
+                break;
+                case 'INSERT':
+                    $this->type = self::INSERT;
+                break;
                 case 'DELETE':
                     $this->type = self::DELETE;
                 break;
@@ -1297,11 +1311,14 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
 
                     if( ! isset($this->tableAliases[$currPath])) {
                         $this->tableIndexes[$tname] = 1;
+                    }  
+
+                    $this->parts['from'] = $this->conn->quoteIdentifier($table->getTableName());
+                    
+                    if ($this->type === self::SELECT) {
+                         $this->parts['from'] .= ' ' . $tname;
                     }
 
-
-                    $this->parts["from"]           = $this->conn->quoteIdentifier($table->getTableName()) . ' ' . $tname;
-
                     $this->tableAliases[$currPath] = $tname;
 
                     $tableName = $tname;