wip

Author: JanJakes

packages/sqlite-database-integration/wp-includes/sqlite/db.php

@@ -12,7 +12,7 @@
 require_once __DIR__ . '/../database/version.php';
 
 // Require the constants file.
-require_once dirname( __DIR__, 2 ) . '/constants.php';
+require_once __DIR__ . '/../../constants.php';
 
 // Bail early if DB_ENGINE is not defined as sqlite.
 if ( ! defined( 'DB_ENGINE' ) || 'sqlite' !== DB_ENGINE ) {
@@ -48,7 +48,7 @@
 }
 
 if ( defined( 'WP_SQLITE_AST_DRIVER' ) && WP_SQLITE_AST_DRIVER ) {
-	require_once __DIR__ . '/../../wp-pdo-mysql-on-sqlite.php';
+	require_once __DIR__ . '/../database/load.php';
 } else {
 	require_once __DIR__ . '/php-polyfills.php';
 	require_once __DIR__ . '/class-wp-sqlite-lexer.php';
@@ -81,13 +81,13 @@
  * that are present in the GitHub repository
  * but not the plugin published on WordPress.org.
  */
-$crosscheck_tests_file_path = dirname( __DIR__, 2 ) . '/tests/class-wp-sqlite-crosscheck-db.php';
+$crosscheck_tests_file_path = __DIR__ . '/class-wp-sqlite-crosscheck-db.php';
 if ( defined( 'SQLITE_DEBUG_CROSSCHECK' ) && SQLITE_DEBUG_CROSSCHECK && file_exists( $crosscheck_tests_file_path ) ) {
 	require_once $crosscheck_tests_file_path;
 	$GLOBALS['wpdb'] = new WP_SQLite_Crosscheck_DB( $db_name );
 } else {
 	$GLOBALS['wpdb'] = new WP_SQLite_DB( $db_name );
 
 	// Boot the Query Monitor plugin if it is active.
-	require_once dirname( __DIR__, 2 ) . '/integrations/query-monitor/boot.php';
+	require_once __DIR__ . '/../../integrations/query-monitor/boot.php';
 }

wp-setup.sh

@@ -56,9 +56,9 @@ EOF
 # 4. Add "db.php" to the "wp-content" directory.
 echo "Adding 'db.php' to the 'wp-content' directory..."
 rm -f "$WP_DIR"/src/wp-content/db.php
-cp "$DIR"/db.copy "$WP_DIR"/src/wp-content/db.php
-sed -i.bak "s#'{SQLITE_IMPLEMENTATION_FOLDER_PATH}'#__DIR__.'/plugins/sqlite-database-integration'#g" "$WP_DIR"/src/wp-content/db.php
-sed -i.bak "s#{SQLITE_PLUGIN}#$WP_DIR/src/wp-content/plugins/sqlite-database-integration/load.php#g" "$WP_DIR"/src/wp-content/db.php
+cp "$DIR"/packages/sqlite-database-integration/db.copy "$WP_DIR"/src/wp-content/db.php
+sed -i.bak "s#'{SQLITE_IMPLEMENTATION_FOLDER_PATH}'#__DIR__.'/plugins/sqlite-database-integration/packages/sqlite-database-integration'#g" "$WP_DIR"/src/wp-content/db.php
+sed -i.bak "s#{SQLITE_PLUGIN}#sqlite-database-integration/packages/sqlite-database-integration/load.php#g" "$WP_DIR"/src/wp-content/db.php
 
 # 5. Rewrite helper class WpdbExposedMethodsForTesting to extend WP_SQLite_DB.
 echo "Rewriting helper class 'WpdbExposedMethodsForTesting' to extend WP_SQLite_DB..."