Merge pull request #1 from Automattic/ast-sqlite-driver

Author: adamziel

.gitattributes

@@ -8,7 +8,4 @@ phpunit.xml.dist export-ignore
 /.github export-ignore
 /grammar-tools export-ignore
 /tests export-ignore
-/wip export-ignore
-/wp-includes/mysql export-ignore
-/wp-includes/parser export-ignore
 /wp-includes/sqlite/class-wp-sqlite-crosscheck-db.php export-ignore

activate.php

@@ -75,8 +75,8 @@ function ( $result ) {
  * When the plugin gets merged in wp-core, this is not to be ported.
  */
 function sqlite_plugin_copy_db_file() {
-	// Bail early if the SQLite3 class does not exist.
-	if ( ! class_exists( 'SQLite3' ) ) {
+	// Bail early if the PDO SQLite extension is not loaded.
+	if ( ! extension_loaded( 'pdo_sqlite' ) ) {
 		return;
 	}
 

admin-notices.php

@@ -19,11 +19,11 @@ function sqlite_plugin_admin_notice() {
 		return;
 	}
 
-	// If SQLite is not detected, bail early.
-	if ( ! class_exists( 'SQLite3' ) ) {
+	// If PDO SQLite is not loaded, bail early.
+	if ( ! extension_loaded( 'pdo_sqlite' ) ) {
 		printf(
 			'<div class="notice notice-error"><p>%s</p></div>',
-			esc_html__( 'The SQLite Integration plugin is active, but the SQLite3 class is missing from your server. Please make sure that SQLite is enabled in your PHP installation.', 'sqlite-database-integration' )
+			esc_html__( 'The SQLite Integration plugin is active, but the PDO SQLite extension is missing from your server. Please make sure that PDO SQLite is enabled in your PHP installation.', 'sqlite-database-integration' )
 		);
 		return;
 	}

admin-page.php

@@ -47,11 +47,7 @@ function sqlite_integration_admin_screen() {
 				?>
 			</p>
 		<?php else : ?>
-			<?php if ( ! class_exists( 'SQLite3' ) ) : ?>
-				<div class="notice notice-error">
-					<p><?php esc_html_e( 'We detected that the SQLite3 class is missing from your server. Please make sure that SQLite is enabled in your PHP installation before proceeding.', 'sqlite-database-integration' ); ?></p>
-				</div>
-			<?php elseif ( ! extension_loaded( 'pdo_sqlite' ) ) : ?>
+			<?php if ( ! extension_loaded( 'pdo_sqlite' ) ) : ?>
 				<div class="notice notice-error">
 					<p><?php esc_html_e( 'We detected that the PDO SQLite driver is missing from your server (the pdo_sqlite extension is not loaded). Please make sure that SQLite is enabled in your PHP installation before proceeding.', 'sqlite-database-integration' ); ?></p>
 				</div>
@@ -130,7 +126,8 @@ function sqlite_plugin_adminbar_item( $admin_bar ) {
 	global $wpdb;
 
 	if ( defined( 'SQLITE_DB_DROPIN_VERSION' ) && defined( 'DB_ENGINE' ) && 'sqlite' === DB_ENGINE ) {
-		$title = '<span style="color:#46B450;">' . __( 'Database: SQLite', 'sqlite-database-integration' ) . '</span>';
+		$suffix = defined( 'WP_SQLITE_AST_DRIVER' ) && WP_SQLITE_AST_DRIVER ? ' (AST)' : '';
+		$title  = '<span style="color:#46B450;">' . __( 'Database: SQLite', 'sqlite-database-integration' ) . $suffix . '</span>';
 	} elseif ( stripos( $wpdb->db_server_info(), 'maria' ) !== false ) {
 		$title = '<span style="color:#DC3232;">' . __( 'Database: MariaDB', 'sqlite-database-integration' ) . '</span>';
 	} else {

composer.json

@@ -8,7 +8,9 @@
 		"issues": "https://github.com/wordpress/sqlite-database-integration/issues"
 	},
 	"require": {
-		"php": ">=7.0"
+		"php": ">=7.0",
+		"ext-pdo": "*",
+		"ext-pdo_sqlite": "*"
 	},
 	"require-dev": {
 		"ext-mbstring": "*",