diff --git a/data/source/Database.php b/data/source/Database.php
index 5b0f22aa7c..881485cdce 100644
--- a/data/source/Database.php
+++ b/data/source/Database.php
@@ -355,7 +355,7 @@ public function name($name) {
 	 */
 	protected function _splitFieldname($field) {
 		if (is_string($field)) {
-			if (preg_match('/^[a-z0-9_-]+\.([a-z0-9_-]+|\*)$/i', $field)) {
+			if (preg_match('/^[a-z0-9_-]+\.([a-z 0-9_-]+|\*)$/i', $field)) {
 				return explode('.', $field, 2);
 			}
 		}
diff --git a/tests/cases/data/source/DatabaseTest.php b/tests/cases/data/source/DatabaseTest.php
index 6bea4098ce..177ce9421f 100644
--- a/tests/cases/data/source/DatabaseTest.php
+++ b/tests/cases/data/source/DatabaseTest.php
@@ -101,6 +101,9 @@ public function testName() {
 
 		$result = $this->_db->name("Model.name");
 		$this->assertEqual("{Model}.{name}", $result);
+
+		$result = $this->_db->name("Model.name name");
+		$this->assertEqual("{Model}.{name name}", $result);
 	}
 
 	public function testValueWithSchema() {