Merge branch 'master' of github.com:c9s/SQLBuilder

c9s · Jun 10, 2016 · ad46b9e · ad46b9e
2 parents 94b1934 + 0729d66
commit ad46b9e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/SQLBuilder/Driver/MySQLDriver.php b/SQLBuilder/Driver/MySQLDriver.php
@@ -21,6 +21,14 @@ public function quoteIdentifier($id) {
         return '`' . addcslashes($id,'`') . '`';
     }
 
+    public function cast($value)
+    {
+        if (is_bool($value)) {
+            return intval($value);
+        }
+        return $value;
+    }
+
     public function deflate($value, ArgumentArray $args = NULL)
     {
         if ($value instanceof DateTime) {

diff --git a/SQLBuilder/Universal/Syntax/Column.php b/SQLBuilder/Universal/Syntax/Column.php
@@ -662,7 +662,7 @@ public function getName() {
 
     public function buildNullClause(BaseDriver $driver) 
     {
-        if ($this->required || $this->notNull) {
+        if ($this->notNull) {
             return ' NOT NULL';
         } elseif ($this->notNull === FALSE) {
             return  ' NULL';