feat: Optionally supply sqlType to addColumnOptions

Author: ralflang

lib/Horde/Db/Adapter/Base/Schema.php

@@ -638,20 +638,21 @@ public function addColumn(
                 'unsigned'  => null],
             $options
         );
-
-        $sql = sprintf(
-            'ALTER TABLE %s ADD %s %s',
-            $this->quoteTableName($tableName),
-            $this->quoteColumnName($columnName),
-            $this->typeToSql(
+        $sqlType = $this->typeToSql(
                 $type,
                 $options['limit'],
                 $options['precision'],
                 $options['scale'],
                 $options['unsigned']
-            )
         );
-        $sql = $this->addColumnOptions($sql, $options);
+
+        $sql = sprintf(
+            'ALTER TABLE %s ADD %s %s',
+            $this->quoteTableName($tableName),
+            $this->quoteColumnName($columnName),
+            $sqlType
+        );
+        $sql = $this->addColumnOptions($sql, $options, $sqlType);
 
         return $this->execute($sql);
     }
@@ -986,7 +987,7 @@ public function typeToSql(
      *
      * @return string  The manipulated SQL definition.
      */
-    public function addColumnOptions($sql, $options)
+    public function addColumnOptions($sql, $options, string $sqlType = '')
     {
         /* 'autoincrement' is not handled here - it varies too much between
          * DBs. Do autoincrement-specific handling in the driver. */

lib/Horde/Db/Adapter/Mysql/Schema.php

@@ -566,12 +566,15 @@ public function typeToSql(
      *
      * @return string  The manipulated SQL definition.
      */
-    public function addColumnOptions($sql, $options)
+    public function addColumnOptions($sql, $options, string $sqlType = '')
     {
-        $sql = parent::addColumnOptions($sql, $options);
+        $sql = parent::addColumnOptions($sql, $options, $sqlType);
         if (isset($options['after'])) {
             $sql .= ' AFTER ' . $this->quoteColumnName($options['after']);
         }
+        if (isset($options['default'])) {
+            $options['default'] = self::filterDefault($options['default'], $sqlType);
+        }
         if (!empty($options['autoincrement'])) {
             $sql .= ' AUTO_INCREMENT';
         }

lib/Horde/Db/Adapter/Oracle/Schema.php

@@ -862,7 +862,7 @@ public function currentDatabase()
      *
      * @return string  The manipulated SQL definition.
      */
-    public function addColumnOptions($sql, $options)
+    public function addColumnOptions($sql, $options, string $sqlType = '')
     {
         /* 'autoincrement' is not handled here - it varies too much between
          * DBs. Do autoincrement-specific handling in the driver. */

src/Adapter/Base/Schema.php

@@ -1003,7 +1003,7 @@ public function typeToSql(
      *
      * @return string  The manipulated SQL definition.
      */
-    public function addColumnOptions($sql, $options)
+    public function addColumnOptions($sql, $options, string $sqlType = '')
     {
         /* 'autoincrement' is not handled here - it varies too much between
          * DBs. Do autoincrement-specific handling in the driver. */

src/Adapter/Mysql/Schema.php

@@ -550,7 +550,7 @@ public function typeToSql(
      *
      * @return string  The manipulated SQL definition.
      */
-    public function addColumnOptions($sql, $options)
+    public function addColumnOptions($sql, $options, string $sqlType = '')
     {
         $sql = parent::addColumnOptions($sql, $options);
         if (isset($options['after'])) {

src/Adapter/Oracle/Schema.php

@@ -869,7 +869,7 @@ public function currentDatabase()
      *
      * @return string  The manipulated SQL definition.
      */
-    public function addColumnOptions($sql, $options)
+    public function addColumnOptions($sql, $options, string $sqlType = '')
     {
         /* 'autoincrement' is not handled here - it varies too much between
          * DBs. Do autoincrement-specific handling in the driver. */