Revert "Inline single-row INSERT VALUES into outer SELECT (correct order)"

This reverts commit 909fd69.

Author: JanJakes

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

@@ -1407,134 +1407,6 @@ jobs:
           open(path, 'w').write(src)
           print('patched UPDATE multi-table to rowid-IN subquery')
 
-          # 17. For single-row INSERT ... VALUES without DEFAULT tokens,
-          #     inline each value expression directly into the wrapping
-          #     SELECT instead of using a FROM (VALUES ...) subquery with
-          #     columnN aliases. Turso can't resolve the outer columnN
-          #     reference through an INSERT...SELECT...FROM subquery even
-          #     when the aliases are explicit. The inline form bypasses
-          #     the columnN indirection entirely and is equivalent SQL on
-          #     real SQLite.
-          src = open(path).read()
-
-          # Step 1: intercept select_list initialization for single-row
-          # VALUES without DEFAULT, set select_list to pre-translated
-          # expressions (wrapped in parens so CAST composes correctly),
-          # and set $inline_values = true.
-          old_init = (
-              "\t\t} else {\n"
-              "\t\t\t// When inserting from a VALUES list, SQLite uses a \"columnN\" naming.\n"
-              "\t\t\t// This also applies to the SET syntax, which is converted to VALUES.\n"
-              "\t\t\tforeach ( array_keys( $insert_list ) as $position ) {\n"
-              "\t\t\t\t$select_list[] = 'column' . ( $position + 1 );\n"
-              "\t\t\t}\n"
-              "\t\t}"
-          )
-          new_init = (
-              "\t\t} else {\n"
-              "\t\t\t$inline_values = false;\n"
-              "\t\t\tif ( 'insertFromConstructor' === $node->rule_name ) {\n"
-              "\t\t\t\t$insert_values = $node->get_first_child_node( 'insertValues' );\n"
-              "\t\t\t\t$value_list    = $insert_values->get_first_child_node( 'valueList' );\n"
-              "\t\t\t\t$values_nodes  = $value_list->get_child_nodes( 'values' );\n"
-              "\t\t\t\t$has_default   = count( $values_nodes ) === 1\n"
-              "\t\t\t\t\t&& count( $values_nodes[0]->get_child_nodes( WP_MySQL_Lexer::DEFAULT_SYMBOL ) ) > 0;\n"
-              "\t\t\t\tif ( count( $values_nodes ) === 1 && ! $has_default ) {\n"
-              "\t\t\t\t\t$inline_values = true;\n"
-              "\t\t\t\t\tforeach ( $values_nodes[0]->get_child_nodes( 'expr' ) as $expr_node ) {\n"
-              "\t\t\t\t\t\t$select_list[] = '(' . $this->translate( $expr_node ) . ')';\n"
-              "\t\t\t\t\t}\n"
-              "\t\t\t\t}\n"
-              "\t\t\t}\n"
-              "\t\t\tif ( ! $inline_values ) {\n"
-              "\t\t\t\t// When inserting from a VALUES list, SQLite uses a \"columnN\" naming.\n"
-              "\t\t\t\t// This also applies to the SET syntax, which is converted to VALUES.\n"
-              "\t\t\t\tforeach ( array_keys( $insert_list ) as $position ) {\n"
-              "\t\t\t\t\t$select_list[] = 'column' . ( $position + 1 );\n"
-              "\t\t\t\t}\n"
-              "\t\t\t}\n"
-              "\t\t}"
-          )
-          assert old_init in src, 'select_list else-branch not found'
-          src = src.replace(old_init, new_init, 1)
-
-          # Step 2: CAST loop — use raw expression when $inline_values.
-          old_cast = (
-              "\t\t\t\t$position   = array_search( $column['COLUMN_NAME'], $insert_list, true );\n"
-              "\t\t\t\t$identifier = $this->quote_sqlite_identifier( $select_list[ $position ] );\n"
-              "\t\t\t\t$value      = $this->cast_value_for_saving( $column['DATA_TYPE'], $identifier );\n"
-          )
-          new_cast = (
-              "\t\t\t\t$position = array_search( $column['COLUMN_NAME'], $insert_list, true );\n"
-              "\t\t\t\t$identifier = ( isset( $inline_values ) && $inline_values )\n"
-              "\t\t\t\t\t? $select_list[ $position ]\n"
-              "\t\t\t\t\t: $this->quote_sqlite_identifier( $select_list[ $position ] );\n"
-              "\t\t\t\t$value = $this->cast_value_for_saving( $column['DATA_TYPE'], $identifier );\n"
-          )
-          assert old_cast in src, 'CAST identifier lookup not found'
-          src = src.replace(old_cast, new_cast, 1)
-
-          # Step 3: FROM wrapping — skip for inline case.
-          old_from_block = (
-              "\t\t// Wrap the original insert VALUES, SELECT, or SET list in a FROM clause.\n"
-              "\t\tif ( 'insertFromConstructor' === $node->rule_name ) {\n"
-              "\t\t\t// VALUES (...)\n"
-              "\t\t\t$insert_values = $node->get_first_child_node( 'insertValues' );\n"
-              "\t\t\t$from          = $this->translate( $insert_values );\n"
-          )
-          new_from_block = (
-              "\t\t// Wrap the original insert VALUES, SELECT, or SET list in a FROM clause.\n"
-              "\t\tif ( isset( $inline_values ) && $inline_values ) {\n"
-              "\t\t\t$from = null;\n"
-              "\t\t} elseif ( 'insertFromConstructor' === $node->rule_name ) {\n"
-              "\t\t\t// VALUES (...)\n"
-              "\t\t\t$insert_values = $node->get_first_child_node( 'insertValues' );\n"
-              "\t\t\t$from          = $this->translate( $insert_values );\n"
-          )
-          assert old_from_block in src, 'FROM wrapping block not found'
-          src = src.replace(old_from_block, new_from_block, 1)
-
-          # Step 4: final emission — omit FROM when $from is null.
-          old_emit = "\t\t$fragment .= ' FROM (' . $from . ') WHERE true';"
-          new_emit = (
-              "\t\tif ( null === $from ) {\n"
-              "\t\t\t$fragment .= ' WHERE true';\n"
-              "\t\t} else {\n"
-              "\t\t\t$fragment .= ' FROM (' . $from . ') WHERE true';\n"
-              "\t\t}"
-          )
-          assert old_emit in src, 'final FROM emission not found'
-          src = src.replace(old_emit, new_emit, 1)
-          open(path, 'w').write(src)
-          print('patched single-row VALUES to inline into outer SELECT (no FROM subquery)')
-
-          # Update Translation_Tests INSERT/REPLACE expectations for the inline form.
-          import re
-          path_tt = 'tests/WP_SQLite_Driver_Translation_Tests.php'
-          src_tt = open(path_tt).read()
-          srow_pat = re.compile(
-              r"SELECT (?P<cols>`column\d+`(?:, `column\d+`)*) FROM \(VALUES \( (?P<vals>[^()]+) \)\) WHERE true"
-          )
-          def rewrite_single_row(m):
-              cols = re.findall(r"`column\d+`", m.group('cols'))
-              vals = [v.strip() for v in m.group('vals').split(',')]
-              if len(cols) != len(vals):
-                  return m.group(0)
-              return "SELECT " + ", ".join(f"({v})" for v in vals) + " WHERE true"
-          src_tt2, n1 = srow_pat.subn(rewrite_single_row, src_tt)
-          scast_pat = re.compile(
-              r"SELECT (?P<casts>CAST\(`column\d+` AS \w+\)(?:, CAST\(`column\d+` AS \w+\))*) FROM \(VALUES \( (?P<vals>[^()]+) \)\) WHERE true"
-          )
-          def rewrite_cast_row(m):
-              types = re.findall(r"CAST\(`column\d+` AS (\w+)\)", m.group('casts'))
-              vals = [v.strip() for v in m.group('vals').split(',')]
-              if len(types) != len(vals):
-                  return m.group(0)
-              return "SELECT " + ", ".join(f"CAST(({v}) AS {t})" for v, t in zip(vals, types)) + " WHERE true"
-          src_tt2, n2 = scast_pat.subn(rewrite_cast_row, src_tt2)
-          open(path_tt, 'w').write(src_tt2)
-          print(f'patched Translation_Tests VALUES expectations: {n1} plain + {n2} CAST')
-
           # 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).