Merge branch 'master' of git://github.com/onPHP/onphp-framework into outerjoin

anisimovt · anisimovt · commit f0d3ae19a28b · 2012-04-23T17:59:14.000+04:00
Conflicts:
	doc/ChangeLog
diff --git a/core/OSQL/DBColumn.class.php b/core/OSQL/DBColumn.class.php
@@ -176,7 +176,7 @@ public function toDialectString(Dialect $dialect)
 						? $dialect->literalToString(Dialect::LITERAL_TRUE)
 						: $dialect->literalToString(Dialect::LITERAL_FALSE);
 				else
-					$default = $dialect->valueToString($default);
+					$default = $dialect->valueToString($this->default);
 				
 				$out .= ' DEFAULT '.($default);
 			}
diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -1,10 +1,15 @@
+2012-04-22	Georgiy T. Kutsurua
+
+	* core/OSQL/DBColumn.class.php: Fix DBColumn
+
 2012-04-20 Timofey A. Anisimov
 
 	* test/main/OsqlSelectTest.class.php,
 	core/SQLFullOuterJoin.class.php,
 	core/Joiner.class.php
 	core/SelectQuery.class.php:
 	Full outer join capability in select query
+
 2012-04-12	Evgeny V. Kokovikhin
 
 	* test/main/Utils/PinbaTest.class.php, main/Monitoring/PinbaClient.class.php:

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public function toDialectString(Dialect $dialect)`
`176`	`176`	`? $dialect->literalToString(Dialect::LITERAL_TRUE)`
`177`	`177`	`: $dialect->literalToString(Dialect::LITERAL_FALSE);`
`178`	`178`	`else`
`179`		`- $default = $dialect->valueToString($default);`
	`179`	`+ $default = $dialect->valueToString($this->default);`
`180`	`180`
`181`	`181`	`$out .= ' DEFAULT '.($default);`
`182`	`182`	`}`