Doctrine

Timestamp:

01/30/08 23:05:43 (17 months ago)

Author:

lsmith

Message:

- MFT

Location:

branches/0.10/lib/Doctrine

Files:

• DataDict/Mssql.php (modified) (2 diffs)
• Import/Mssql.php (modified) (2 diffs)

branches/0.10/lib/Doctrine/DataDict/Mssql.php

@@ -124 +124 @@
     public function getPortableDeclaration($field)
     {
-        $db_type = preg_replace('/\d/','', strtolower($field['type']) );
+        $db_type = preg_replace('/[\d\(\)]/','', strtolower($field['type']) );
         $length  = (isset($field['length']) && $field['length'] > 0) ? $field['length'] : null;
 
@@ -138 +138 @@
                 $type[0] = 'boolean';
             break;
+            case 'tinyint':
+            case 'smallint':
             case 'int':
                 $type[0] = 'integer';

branches/0.10/lib/Doctrine/Import/Mssql.php

@@ -74 +74 @@
             }
 
+            $val['type'] = $type;
+            $val['identity'] = $identity;
             $decl = $this->conn->dataDict->getPortableDeclaration($val);
 
@@ -113 +115 @@
     public function listTables($database = null)
     {
-        $sql = "SELECT name FROM sysobjects WHERE type = 'U' ORDER BY name";
+        $sql = "SELECT name FROM sysobjects WHERE type = 'U' AND name <> 'dtproperties' ORDER BY name";
 
         return $this->conn->fetchColumn($sql);