Extend DEFAULT now() handling + update UPDATE Translation_Tests expectations

Author: JanJakes

.github/workflows/phpunit-tests-turso.yml

@@ -1321,9 +1321,11 @@ jobs:
               "\t\t\t\t} elseif ( str_contains( $column['EXTRA'], 'DEFAULT_GENERATED' ) ) {\n"
               "\t\t\t\t\t$ast            = $this->create_parser( 'SELECT ' . $column['COLUMN_DEFAULT'] )->parse();\n"
               "\t\t\t\t\t$expr           = $ast->get_first_descendant_node( 'selectItem' )->get_first_child_node();\n"
-              "\t\t\t\t\t$default_clause = $this->translate( $expr );\n"
-              "\t\t\t\t\tif ( preg_match( '/^[A-Za-z_][A-Za-z_0-9]*$/', trim( $default_clause ) ) ) {\n"
-              "\t\t\t\t\t\t// Simple identifier (e.g. CURRENT_TIMESTAMP): omit parens\n"
+              "\t\t\t\t\t$default_clause = trim( $this->translate( $expr ) );\n"
+              "\t\t\t\t\t$dc_upper       = strtoupper( $default_clause );\n"
+              "\t\t\t\t\t$is_keyword     = in_array( $dc_upper, array( 'CURRENT_TIMESTAMP', 'CURRENT_DATE', 'CURRENT_TIME' ), true );\n"
+              "\t\t\t\t\tif ( $is_keyword || preg_match( '/^[A-Za-z_][A-Za-z_0-9]*$/', $default_clause ) ) {\n"
+              "\t\t\t\t\t\t// Simple identifier or known keyword: emit without parens\n"
               "\t\t\t\t\t\t// so Turso's PRAGMA round-trip matches SQLite.\n"
               "\t\t\t\t\t\t$query .= ' DEFAULT ' . $default_clause;\n"
               "\t\t\t\t\t} else {\n"
@@ -1332,8 +1334,31 @@ jobs:
               "\t\t\t\t}"
           )
           assert old in src, 'DEFAULT_GENERATED block not found'
-          open(path, 'w').write(src.replace(old, new, 1))
-          print('patched DEFAULT_GENERATED simple-identifier unwrap')
+          src = src.replace(old, new, 1)
+
+          # Also extend the existing CURRENT_TIMESTAMP literal special-case to
+          # match "now()" (MySQL alias) so the DEFAULT_GENERATED branch isn't
+          # taken at all for that input. Real SQLite normalizes this; this
+          # makes our SQLite emission match.
+          old_ct = (
+              "\t\t\t\tif (\n"
+              "\t\t\t\t\t'CURRENT_TIMESTAMP' === $column['COLUMN_DEFAULT']\n"
+              "\t\t\t\t\t&& ( 'timestamp' === $column['DATA_TYPE'] || 'datetime' === $column['DATA_TYPE'] )\n"
+              "\t\t\t\t) {\n"
+              "\t\t\t\t\t$query .= ' DEFAULT CURRENT_TIMESTAMP';\n"
+          )
+          new_ct = (
+              "\t\t\t\tif (\n"
+              "\t\t\t\t\tin_array( strtolower( $column['COLUMN_DEFAULT'] ), array( 'current_timestamp', 'now()' ), true )\n"
+              "\t\t\t\t\t&& ( 'timestamp' === $column['DATA_TYPE'] || 'datetime' === $column['DATA_TYPE'] )\n"
+              "\t\t\t\t) {\n"
+              "\t\t\t\t\t$query .= ' DEFAULT CURRENT_TIMESTAMP';\n"
+          )
+          assert old_ct in src, 'CURRENT_TIMESTAMP literal special case not found'
+          src = src.replace(old_ct, new_ct, 1)
+
+          open(path, 'w').write(src)
+          print('patched DEFAULT_GENERATED simple-identifier unwrap + now() special case')
 
           # 16. Turso doesn't implement UPDATE ... FROM. The driver uses it to
           #     translate MySQL multi-table UPDATE (UPDATE t1, t2 JOIN t3 SET
@@ -1407,6 +1432,29 @@ jobs:
           open(path, 'w').write(src)
           print('patched UPDATE multi-table to rowid-IN subquery')
 
+          # Update Translation_Tests testUpdate expectations to match the
+          # rowid-IN subquery form.
+          path_tt = 'tests/WP_SQLite_Driver_Translation_Tests.php'
+          src_tt = open(path_tt).read()
+          for old_q, new_q in [
+              (
+                  "'UPDATE `t1` SET `id` = 1 FROM `t2` WHERE `t1`.`c` = `t2`.`c`'",
+                  "'UPDATE `t1` SET `id` = 1 WHERE rowid IN ( SELECT `t1`.rowid FROM `t1` , `t2` WHERE `t1`.`c` = `t2`.`c` )'",
+              ),
+              (
+                  "'UPDATE `t1` SET `id` = 1 FROM `t2` WHERE `t1`.`c` = 2 AND `t1`.`c` = `t2`.`c`'",
+                  "'UPDATE `t1` SET `id` = 1 WHERE rowid IN ( SELECT `t1`.rowid FROM `t1` JOIN `t2` ON `t1`.`c` = `t2`.`c` WHERE `t1`.`c` = 2 )'",
+              ),
+              (
+                  "'UPDATE `t1` SET `id` = 1 FROM ( SELECT * FROM `t2` ) AS `t2` WHERE `t1`.`c` = 2 AND `t1`.`c` = `t2`.`c`'",
+                  "'UPDATE `t1` SET `id` = 1 WHERE rowid IN ( SELECT `t1`.rowid FROM `t1` JOIN ( SELECT * FROM `t2` ) AS `t2` ON `t1`.`c` = `t2`.`c` WHERE `t1`.`c` = 2 )'",
+              ),
+          ]:
+              if old_q in src_tt:
+                  src_tt = src_tt.replace(old_q, new_q, 1)
+          open(path_tt, 'w').write(src_tt)
+          print('patched Translation_Tests testUpdate expectations to rowid-IN form')
+
           # 14. Update Translation_Tests::testHexadecimalLiterals to match
           #     the hex-literal alias force patch (which needs to stay so
           #     Turso doesn't mangle x'417a' into 17a' at runtime).