diff --git a/cake/libs/model/datasources/dbo/dbo_adodb.php b/cake/libs/model/datasources/dbo/dbo_adodb.php
index 45ba6d38f..ec3c03fcf 100644
--- a/cake/libs/model/datasources/dbo/dbo_adodb.php
+++ b/cake/libs/model/datasources/dbo/dbo_adodb.php
@@ -63,18 +63,36 @@ class DboAdodb extends DboSource {
  * @var array
  * @access private
  */
-	 var $_adodb_column_types = array(
-	 	'C' => 'string',
-		'X' => 'text',
-		'D' => 'date',
-		'T' => 'timestamp',
-		'L' => 'boolean',
-		'N' => 'float',
-		'I' => 'integer',
-		'R' => 'integer', // denotes auto-increment or counter field
-		'B' => 'binary'
+	 var $_adodbColumnTypes = array(
+	 	'string' => 'C',
+		'text' => 'X',
+		'date' => 'D',
+		'timestamp' => 'T',
+		'time' => 'T',
+		'datetime' => 'T',
+		'boolean' => 'L',
+		'float' => 'N',
+		'integer' => 'I',
+		'binary' => 'R',
+	);
+/**
+ * ADOdb column definition
+ *
+ * @var array
+ */
+	var $columns = array(
+		'primary_key' => array('name' => 'R', 'limit' => 11),
+		'string' => array('name' => 'C', 'limit' => '255'),
+		'text' => array('name' => 'X'),
+		'integer' => array('name' => 'I', 'limit' => '11', 'formatter' => 'intval',),
+		'float' => array('name' => 'N', 'formatter' => 'floatval'),
+		'timestamp' => array('name' => 'T', 'format' => 'Y-m-d H:i:s', 'formatter' => 'date'),
+		'time' => array('name' => 'T',  'format' => 'H:i:s', 'formatter' => 'date'),
+		'datetime' => array('name' => 'T', 'format' => 'Y-m-d H:i:s', 'formatter' => 'date'),
+		'date' => array('name' => 'D', 'format' => 'Y-m-d', 'formatter' => 'date'),		
+		'binary' => array('name' => 'B'),
+		'boolean' => array('name' => 'L', 'limit' => '1')
 	);
-
 /**
  * Connects to the database using options in the given configuration array.
  *
@@ -91,13 +109,16 @@ class DboAdodb extends DboSource {
 			$adodb_driver = substr($config['connect'], 0, $persistent);
 			$connect = 'PConnect';
 		}
-
+		
 		$this->_adodb = NewADOConnection($adodb_driver);
-
+		
+		$this->_adodbDataDict = NewDataDictionary($this->_adodb, $adodb_driver);
+		
 		$this->startQuote = $this->_adodb->nameQuote;
 		$this->endQuote = $this->_adodb->nameQuote;
 
 		$this->connected = $this->_adodb->$connect($config['host'], $config['login'], $config['password'], $config['database']);
+		$this->_adodbMetatyper = &$this->_adodb->execute('Select 1');
 		return $this->connected;
 	}
 /**
@@ -116,7 +137,7 @@ class DboAdodb extends DboSource {
  */
 	function _execute($sql) {
 		global $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;	
 		return $this->_adodb->execute($sql);
 	}
 /**
@@ -219,11 +240,19 @@ class DboAdodb extends DboSource {
 
 		$fields = false;
 		$cols = $this->_adodb->MetaColumns($this->fullTableName($model, false));
-
-		foreach ($cols as $column) {
+		
+		foreach ($cols as $column) {	
 			$fields[$column->name] = array(
-										'type' => $this->column($column->type)
+										'type' => $this->column($column->type),
+										'null' => !$column->not_null,
+										'length' => $column->max_length,
 									);
+			if ($column->has_default) {
+				$fields[$column->name]['default'] = $column->default_value;
+			}
+			if ($column->primary_key == 1) {
+				$fields[$column->name]['key'] = 'primary';
+			}
 		}
 
 		$this->__cacheDescription($this->fullTableName($model, false), $fields);
@@ -273,10 +302,20 @@ class DboAdodb extends DboSource {
  * @todo Please change output string to whatever select your database accepts. adodb doesn't allow us to get the correct limit string out of it.
  */
 	 function limit($limit, $offset = null) {
-	 	if (empty($limit)) {
-	 		return null;
-	 	}
-		return " LIMIT {$limit}" . ($offset ? "{$offset}" : null);
+		if ($limit) {
+			$rt = '';
+			if (!strpos(strtolower($limit), 'limit') || strpos(strtolower($limit), 'limit') === 0) {
+				$rt = ' LIMIT';
+			}
+
+			if ($offset) {
+				$rt .= ' ' . $offset . ',';
+			}
+
+			$rt .= ' ' . $limit;
+			return $rt;
+		}
+		return null;
 	 // please change to whatever select your database accepts
 	 // adodb doesn't allow us to get the correct limit string out of it
 	 }
@@ -288,18 +327,14 @@ class DboAdodb extends DboSource {
  * @return string Abstract column type (i.e. "string")
  */
 	function column($real) {
-		if (isset($this->_result)) {
-			$adodb_metatyper = &$this->_result;
-		} else {
-			$adodb_metatyper = &$this->_adodb->execute('Select 1');
-		}
-
-		$interpreted_type = $adodb_metatyper->MetaType($real);
-		if (!isset($this->_adodb_column_types[$interpreted_type])) {
+		$metaTypes = array_flip($this->_adodbColumnTypes);
+		
+		$interpreted_type = $this->_adodbMetatyper->MetaType($real);
+		
+		if (!isset($metaTypes[$interpreted_type])) {
 			return 'text';
 		}
-
-		return $this->_adodb_column_types[$interpreted_type];
+		return $metaTypes[$interpreted_type];
 	}
 /**
  * Returns a quoted and escaped string of $data for use in an SQL statement.
@@ -324,6 +359,7 @@ class DboAdodb extends DboSource {
 		}
 		return $this->_adodb->qstr($data);
 	}
+
 /**
  * Generates the fields list of an SQL query.
  *
@@ -332,37 +368,27 @@ class DboAdodb extends DboSource {
  * @param mixed $fields
  * @return array
  */
-	function fields(&$model, $alias = null, $fields = null, $quote = true) {
+	function fields(&$model, $alias = null, $fields = array(), $quote = true) {
 		if (empty($alias)) {
 			$alias = $model->alias;
 		}
+		$fields = parent::fields($model, $alias, $fields, false);
 
-		if (!is_array($fields)) {
-			if ($fields != null) {
-				if (strpos($fields, ',')) {
-					$fields = explode(',', $fields);
-				} else {
-					$fields = array($fields);
-				}
-				$fields = array_map('trim', $fields);
-			} else {
-				$fields = array_keys($model->schema());
-			}
+		if (!$quote) {
+			return $fields;
 		}
-
 		$count = count($fields);
 
 		if ($count >= 1 && $fields[0] != '*' && strpos($fields[0], 'COUNT(*)') === false) {
 			for ($i = 0; $i < $count; $i++) {
-				if (!preg_match('/^.+\\(.*\\)/', $fields[$i])) {
+				if (!preg_match('/^.+\\(.*\\)/', $fields[$i]) && !preg_match('/\s+AS\s+/', $fields[$i])) {
 					$prepend = '';
 					if (strpos($fields[$i], 'DISTINCT') !== false) {
 						$prepend = 'DISTINCT ';
 						$fields[$i] = trim(str_replace('DISTINCT', '', $fields[$i]));
 					}
 
-					$dot = strrpos($fields[$i], '.');
-					if ($dot === false) {
+					if (strrpos($fields[$i], '.') === false) {
 						$fields[$i] = $prepend . $this->name($alias) . '.' . $this->name($fields[$i]) . ' AS ' . $this->name($alias . '__' . $fields[$i]);
 					} else {
 						$build = explode('.', $fields[$i]);
@@ -374,9 +400,9 @@ class DboAdodb extends DboSource {
 		return $fields;
 	}
 /**
- * Enter description here...
+ * Build ResultSets and map data
  *
- * @param unknown_type $results
+ * @param array $results
  */
 	function resultSet(&$results) {
 		$num_fields = count($results);
@@ -388,7 +414,7 @@ class DboAdodb extends DboSource {
 
 		while ($j < $num_fields) {
 			$columnName = $fields[$j];
-
+				
 			if (strpos($columnName, '__')) {
 				$parts = explode('__', $columnName);
 				$this->map[$index++] = array($parts[0], $parts[1]);
@@ -418,5 +444,75 @@ class DboAdodb extends DboSource {
 			return false;
 		}
 	}
+	
+/**
+ * Generate a database-native column schema string
+ *
+ * @param array $column An array structured like the following: array('name'=>'value', 'type'=>'value'[, options]),
+ *                      where options can be 'default', 'length', or 'key'.
+ * @return string
+ */
+	function buildColumn($column) {
+		$name = $type = null;
+		extract(array_merge(array('null' => true), $column));
+
+		if (empty($name) || empty($type)) {
+			trigger_error('Column name or type not defined in schema', E_USER_WARNING);
+			return null;
+		}
+		
+		//$metaTypes = array_flip($this->_adodbColumnTypes);
+		if (!isset($this->_adodbColumnTypes[$type])) {
+			trigger_error("Column type {$type} does not exist", E_USER_WARNING);
+			return null;
+		}
+		$metaType = $this->_adodbColumnTypes[$type];		
+		$concreteType = $this->_adodbDataDict->ActualType($metaType);
+		$real = $this->columns[$type];
+		
+		//UUIDs are broken so fix them.
+		if ($type == 'string' && isset($real['length']) && $real['length'] == 36) {
+			$concreteType = 'CHAR';
+		}
+		
+		$out = $this->name($name) . ' ' . $concreteType;
+	
+		if (isset($real['limit']) || isset($real['length']) || isset($column['limit']) || isset($column['length'])) {
+			if (isset($column['length'])) {
+				$length = $column['length'];
+			} elseif (isset($column['limit'])) {
+				$length = $column['limit'];
+			} elseif (isset($real['length'])) {
+				$length = $real['length'];
+			} else {
+				$length = $real['limit'];
+			}
+			$out .= '(' . $length . ')';
+		}
+		$_notNull = $_default = $_autoInc = $_constraint = $_unsigned = false;
+		
+		if (isset($column['key']) && $column['key'] == 'primary' && $type == 'integer') {
+			$_constraint = '';
+			$_autoInc = true;
+		} elseif (isset($column['key']) && $column['key'] == 'primary') {
+			$_notNull = '';
+		} elseif (isset($column['default']) && isset($column['null']) && $column['null'] == false) {
+			$_notNull = true;
+			$_default = $column['default'];
+		} elseif ( isset($column['null']) && $column['null'] == true) {
+			$_notNull = false;
+			$_default = 'NULL';
+		}
+		if (isset($column['default']) && $_default == false) {
+			$_default = $this->value($column['default']);
+		}
+		if (isset($column['null']) && $column['null'] == false) {
+			$_notNull = true;
+		}
+		//use concrete instance of DataDict to make the suffixes for us.
+		$out .=	$this->_adodbDataDict->_CreateSuffix($out, $metaType, $_notNull, $_default, $_autoInc, $_constraint, $_unsigned);
+		return $out;
+
+	}	
 }
 ?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
new file mode 100644
index 000000000..da492612f
--- /dev/null
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
@@ -0,0 +1,215 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * AdoDB layer for DBO.
+ *
+ * Long description for file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) :  Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright 2005-2008, Cake Software Foundation, Inc.
+ *								1785 E. Sahara Avenue, Suite 490-204
+ *								Las Vegas, Nevada 89104
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright		Copyright 2005-2008, Cake Software Foundation, Inc.
+ * @link				http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @package			cake
+ * @subpackage		cake.cake.libs.model.datasources.dbo
+ * @since			CakePHP(tm) v 0.2.9
+ * @version			$Rev$
+ * @modifiedby		$LastChangedBy$
+ * @lastmodified	$Date$
+ * @license			http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+
+require_once LIBS.'model'.DS.'model.php';
+require_once LIBS.'model'.DS.'datasources'.DS.'datasource.php';
+require_once LIBS.'model'.DS.'datasources'.DS.'dbo_source.php';
+require_once LIBS.'model'.DS.'datasources'.DS.'dbo'.DS.'dbo_adodb.php';
+
+/**
+ * Short description for class.
+ *
+ * @package		cake.tests
+ * @subpackage	cake.tests.cases.libs.model.datasources
+ */
+class DboAdoTestDb extends DboAdodb {
+
+	var $simulated = array();
+
+	var $testing = true;
+
+	function _execute($sql) {
+		if ($this->testing) {
+			$this->simulated[] = $sql;
+			return null;
+		}
+		return parent::_execute($sql);
+	}
+
+	function getLastQuery() {
+		return $this->simulated[count($this->simulated) - 1];
+	}
+}
+
+/**
+ * Short description for class.
+ *
+ * @package		cake.tests
+ * @subpackage	cake.tests.cases.libs.model.datasources
+ */
+class AdodbTestModel extends CakeTestModel {
+
+	var $name = 'AdodbTestModel';
+	var $useTable = false;
+
+	function find($conditions = null, $fields = null, $order = null, $recursive = null) {
+		return $conditions;
+	}
+
+	function findAll($conditions = null, $fields = null, $order = null, $recursive = null) {
+		return $conditions;
+	}
+
+	function schema() {
+		return array(
+			'id'		=> array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+			'client_id'	=> array('type' => 'integer', 'null' => '', 'default' => '0', 'length' => '11'),
+			'name'		=> array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+			'login'		=> array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+			'passwd'	=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '255'),
+			'addr_1'	=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '255'),
+			'addr_2'	=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '25'),
+			'zip_code'	=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+			'city'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+			'country'	=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+			'phone'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+			'fax'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+			'url'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '255'),
+			'email'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+			'comments'	=> array('type' => 'text', 'null' => '1', 'default' => '', 'length' => ''),
+			'last_login'=> array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => ''),
+			'created'	=> array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
+			'updated'	=> array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
+		);
+	}
+}
+
+if (!class_exists('Article')) {
+	class Article extends CakeTestModel {
+		var $name = 'Article';
+	
+	}
+}
+
+/**
+ * The test class for the DboAdobd
+ *
+ * @package		cake.tests
+ * @subpackage	cake.tests.cases.libs.model.datasources.dbo
+ */
+class DboAdodbTest extends CakeTestCase {
+/**
+ * The Dbo instance to be tested
+ *
+ * @var object
+ * @access public
+ */
+	var $db = null;
+	
+/**
+ * undocumented class variable
+ *
+ * @var string
+ **/
+	var $fixtures = array('core.article');
+	
+/**
+ * Skip if cannot connect to AdoDb
+ *
+ * @access public
+ */
+	function skip() {
+		$this->_initDb();
+		$db =& ConnectionManager::getDataSource('test_suite');
+		$this->skipif($db->config['driver'] != 'adodb', 'Adodb connection not available');
+	}
+/**
+ * Sets up a Dbo class instance for testing
+ *
+ * @access public
+ */
+	function setUp() {
+		$db = ConnectionManager::getDataSource('test_suite');
+		$this->db = new DboAdoTestDb($db->config);
+		$this->model = new AdodbTestModel();
+	}
+/**
+ * Sets up a Dbo class instance for testing
+ *
+ * @access public
+ */
+	function tearDown() {
+		unset($this->db);
+	}
+/**
+ * Test Dbo value method
+ *
+ * @access public
+ */
+	function testQuoting() {
+		$result = $this->db->fields($this->model);
+		$expected = array(
+			'`AdodbTestModel`.`id` AS `AdodbTestModel__id`',
+			'`AdodbTestModel`.`client_id` AS `AdodbTestModel__client_id`',
+			'`AdodbTestModel`.`name` AS `AdodbTestModel__name`',
+			'`AdodbTestModel`.`login` AS `AdodbTestModel__login`',
+			'`AdodbTestModel`.`passwd` AS `AdodbTestModel__passwd`',
+			'`AdodbTestModel`.`addr_1` AS `AdodbTestModel__addr_1`',
+			'`AdodbTestModel`.`addr_2` AS `AdodbTestModel__addr_2`',
+			'`AdodbTestModel`.`zip_code` AS `AdodbTestModel__zip_code`',
+			'`AdodbTestModel`.`city` AS `AdodbTestModel__city`',
+			'`AdodbTestModel`.`country` AS `AdodbTestModel__country`',
+			'`AdodbTestModel`.`phone` AS `AdodbTestModel__phone`',
+			'`AdodbTestModel`.`fax` AS `AdodbTestModel__fax`',
+			'`AdodbTestModel`.`url` AS `AdodbTestModel__url`',
+			'`AdodbTestModel`.`email` AS `AdodbTestModel__email`',
+			'`AdodbTestModel`.`comments` AS `AdodbTestModel__comments`',
+			'`AdodbTestModel`.`last_login` AS `AdodbTestModel__last_login`',
+			'`AdodbTestModel`.`created` AS `AdodbTestModel__created`',
+			'`AdodbTestModel`.`updated` AS `AdodbTestModel__updated`'
+		);
+		$this->assertEqual($result, $expected);
+
+		$expected = "'1.2'";
+		$result = $this->db->value(1.2, 'float');
+		$this->assertEqual($expected, $result);
+
+		$expected = "'1,2'";
+		$result = $this->db->value('1,2', 'float');
+		$this->assertEqual($expected, $result);
+
+		$expected = "'4713e29446'";
+		$result = $this->db->value('4713e29446');
+		$this->assertEqual($expected, $result);
+
+		$expected = "'10010001'";
+		$result = $this->db->value('10010001');
+		$this->assertEqual($expected, $result);
+
+		$expected = "'00010010001'";
+		$result = $this->db->value('00010010001');
+		$this->assertEqual($expected, $result);
+	}
+
+	function testColumns() {
+
+	}
+
+}
+?>
\ No newline at end of file