Merge native AST identity work into Rust parser branch

Author: adamziel

.github/workflows/mysql-parser-extension-tests.yml

@@ -144,13 +144,31 @@ jobs:
           $parser = $driver->create_parser( "SELECT 1" );
           $parser->next_query();
           $ast = $parser->get_query_ast();
-          $property = ( new ReflectionClass( $ast ) )->getProperty( "native_ast" );
-          $property->setAccessible( true );
-          $native_ast = $property->getValue( $ast );
-          if ( ! is_object( $native_ast ) || "WP_MySQL_Native_Ast" !== get_class( $native_ast ) ) {
+          if ( ! ( $ast instanceof WP_MySQL_Native_Parser_Node ) ) {
               fwrite( STDERR, "SQLite driver did not return a native-backed AST.\n" );
               exit( 1 );
           }
+          $reflection = new ReflectionObject( $ast );
+          if ( $reflection->hasProperty( "native_ast" ) || $reflection->hasProperty( "native_node_index" ) ) {
+              fwrite( STDERR, "Native wrapper still stores Rust AST handle properties.\n" );
+              exit( 1 );
+          }
+          $first = $ast->get_first_child_node();
+          if ( ! ( $first instanceof WP_MySQL_Native_Parser_Node ) ) {
+              fwrite( STDERR, "Native wrapper did not return a native-backed child node.\n" );
+              exit( 1 );
+          }
+          if ( $first !== $ast->get_first_child_node() ) {
+              fwrite( STDERR, "Native wrapper identity is not stable across reads.\n" );
+              exit( 1 );
+          }
+          $synthetic = new WP_Parser_Node( 0, "synthetic" );
+          $first->append_child( $synthetic );
+          $same_first = $ast->get_first_child_node();
+          if ( $same_first !== $first || ! in_array( $synthetic, $same_first->get_children(), true ) ) {
+              fwrite( STDERR, "Materialized native wrapper was lost from the parent cache.\n" );
+              exit( 1 );
+          }
           '
 
       - name: Run PHPUnit tests with SQLite driver using parser extension

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

@@ -38,8 +38,31 @@ jobs:
           else
             TAG="version-${VERSION}"
           fi
-          wget -O sqlite.tar.gz "https://sqlite.org/src/tarball/sqlite.tar.gz?r=${TAG}"
+          SQLITE_SOURCE="https://sqlite.org/src/tarball/sqlite.tar.gz?r=${TAG}"
+          SQLITE_MIRROR="https://github.com/sqlite/sqlite/archive/refs/tags/${TAG}.tar.gz"
+          DOWNLOADED=0
+          for url in "$SQLITE_SOURCE" "$SQLITE_MIRROR"; do
+            for attempt in 1 2 3 4 5; do
+              if wget -O sqlite.tar.gz "$url"; then
+                DOWNLOADED=1
+                break 2
+              fi
+              if [ "$attempt" -lt 5 ]; then
+                sleep $(( attempt * 10 ))
+              fi
+            done
+          done
+          if [ "$DOWNLOADED" -ne 1 ]; then
+            exit 1
+          fi
           tar xzf sqlite.tar.gz
+          if [ ! -d sqlite ]; then
+            SQLITE_DIR=$(find . -maxdepth 1 -type d -name 'sqlite-*' | head -n 1)
+            if [ -z "$SQLITE_DIR" ]; then
+              exit 1
+            fi
+            mv "$SQLITE_DIR" sqlite
+          fi
           cd sqlite
           ./configure --prefix=/usr/local CFLAGS="-DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS5 -DSQLITE_USE_URI -DSQLITE_ENABLE_JSON1" LDFLAGS="-lm"
           make -j$(nproc)

.github/workflows/wp-tests-phpunit-native-extension-setup.sh

@@ -125,14 +125,36 @@ $driver = new WP_PDO_MySQL_On_SQLite( 'mysql-on-sqlite:path=:memory:;dbname=wp;'
 $parser = $driver->create_parser( 'SELECT 1' );
 $parser->next_query();
 $ast = $parser->get_query_ast();
-$property = ( new ReflectionClass( $ast ) )->getProperty( 'native_ast' );
-$property->setAccessible( true );
-$native_ast = $property->getValue( $ast );
 
-if ( ! is_object( $native_ast ) || 'WP_MySQL_Native_Ast' !== get_class( $native_ast ) ) {
+if ( ! ( $ast instanceof WP_MySQL_Native_Parser_Node ) ) {
 	fwrite( STDERR, "WordPress PHP test container did not select the native-backed AST.\n" );
 	exit( 1 );
 }
+
+$reflection = new ReflectionObject( $ast );
+if ( $reflection->hasProperty( 'native_ast' ) || $reflection->hasProperty( 'native_node_index' ) ) {
+	fwrite( STDERR, "Native wrapper still stores Rust AST handle properties.\n" );
+	exit( 1 );
+}
+
+$first = $ast->get_first_child_node();
+if ( ! ( $first instanceof WP_MySQL_Native_Parser_Node ) ) {
+	fwrite( STDERR, "Native wrapper did not return a native-backed child node.\n" );
+	exit( 1 );
+}
+
+if ( $first !== $ast->get_first_child_node() ) {
+	fwrite( STDERR, "Native wrapper identity is not stable across reads.\n" );
+	exit( 1 );
+}
+
+$synthetic = new WP_Parser_Node( 0, 'synthetic' );
+$first->append_child( $synthetic );
+$same_first = $ast->get_first_child_node();
+if ( $same_first !== $first || ! in_array( $synthetic, $same_first->get_children(), true ) ) {
+	fwrite( STDERR, "Materialized native wrapper was lost from the parent cache.\n" );
+	exit( 1 );
+}
 EOF
 
 node tools/local-env/scripts/docker.js run --rm php php -m | grep -qx 'wp_mysql_parser'

packages/mysql-on-sqlite/src/load.php

@@ -27,7 +27,6 @@
 
 if ( class_exists( 'WP_MySQL_Native_Parser', false ) ) {
 	require_once __DIR__ . '/mysql/native/mysql-rust-bridge.php';
-	require_once __DIR__ . '/mysql/native/class-wp-mysql-native-ast-cache.php';
 	require_once __DIR__ . '/mysql/native/class-wp-mysql-native-parser-node.php';
 	require_once __DIR__ . '/mysql/native/class-wp-mysql-parser.php';
 } else {