Changeset 3084383

Timestamp:

05/10/2024 07:30:52 AM (3 months ago)

Author:

aristath

Message:

v2.1.10

Location:

sqlite-database-integration/trunk

Files:

• admin-page.php (modified) (1 diff)
• load.php (modified) (2 diffs)
• php-polyfills.php (added)
• readme.txt (modified) (1 diff)
• wp-includes/sqlite/class-wp-sqlite-translator.php (modified) (15 diffs)
• wp-includes/sqlite/install-functions.php (modified) (1 diff)

sqlite-database-integration/trunk/admin-page.php

@@ -59 +59 @@
                 <?php if ( defined( 'PERFLAB_SQLITE_DB_DROPIN_VERSION' ) ) : ?>
                     <div class="notice notice-warning">
-                    <p>
+                        <p>
+                            <?php
+                            printf(
+                                /* translators: %s: db.php drop-in path */
+                                esc_html__( 'An older %s file was detected. Please click the button below to update the file.', 'sqlite-database-integration' ),
+                                '<code>' . esc_html( basename( WP_CONTENT_DIR ) ) . '/db.php</code>'
+                            );
+                            ?>
+                        </p>
+                    </div>
+                    <a class="button button-primary" href="<?php echo esc_url( wp_nonce_url( admin_url( 'admin.php?page=sqlite-integration&confirm-install&upgrade-from-pl' ), 'sqlite-install' ) ); ?>">
                         <?php
                         printf(
                             /* translators: %s: db.php drop-in path */
-                            esc_html__( 'An older %s file was detected. Please click the button below to update the file.', 'sqlite-database-integration' ),
+                            esc_html__( '', 'sqlite-database-integration' ),
                             '<code>' . esc_html( basename( WP_CONTENT_DIR ) ) . '/db.php</code>'
                         );
                         ?>
-                    </p>
-                </div>
-                <a class="button button-primary" href="<?php echo esc_url( wp_nonce_url( admin_url( 'admin.php?page=sqlite-integration&confirm-install&upgrade-from-pl' ), 'sqlite-install' ) ); ?>">
-                    <?php
-                    printf(
-                        /* translators: %s: db.php drop-in path */
-                        esc_html__( 'Update %s file', 'sqlite-database-integration' ),
-                        '<code>' . esc_html( basename( WP_CONTENT_DIR ) ) . '/db.php</code>'
-                    );
-                    ?>
-                </a>
+                    </a>
                 <?php else : ?>
                     <div class="notice notice-error">

sqlite-database-integration/trunk/load.php

@@ -4 +4 @@
  * Description: SQLite database driver drop-in.
  * Author: The WordPress Team
- * Version: 2.1.9
+ * Version: 2.1.
  * Requires PHP: 7.0
  * Textdomain: sqlite-database-integration
@@ -15 +15 @@
 define( 'SQLITE_MAIN_FILE', __FILE__ );
 
+
 require_once __DIR__ . '/admin-page.php';
 require_once __DIR__ . '/activate.php';

sqlite-database-integration/trunk/readme.txt

@@ -5 +5 @@
 Tested up to:      6.4
 Requires PHP:      5.6
-Stable tag:        2.1.9
+Stable tag:        2.1.
 License:           GPLv2 or later
 License URI:       https://www.gnu.org/licenses/gpl-2.0.html

sqlite-database-integration/trunk/wp-includes/sqlite/class-wp-sqlite-translator.php

@@ -1129 +1129 @@
          * SQLite does not support this behavior, so we need to add the `ON CONFLICT REPLACE` clause to the column definition.
          */
-        if ($field->not_null) {
+        if () {
             $definition .= ' ON CONFLICT REPLACE';
         }
@@ -1135 +1135 @@
          * The value of DEFAULT can be NULL. PHP would print this as an empty string, so we need a special case for it.
          */
-        if (null === $field->default) {
+        if () {
             $definition .= ' DEFAULT NULL';
-        } else if (false !== $field->default) {
+        } else) {
             $definition .= ' DEFAULT ' . $field->default;
-        } else if ($field->not_null) {
+        } else) {
             /**
              * If the column is NOT NULL, we need to provide a default value to match WPDB behavior caused by removing the STRICT_TRANS_TABLES mode.
              */
-            if ('text' === $field->sqlite_data_type) {
+            if () {
                 $definition .= ' DEFAULT \'\'';
-            } else if (in_array($field->sqlite_data_type, array('integer', 'real'), true)) {
+            } else) {
                 $definition .= ' DEFAULT 0';
             }
@@ -1439 +1439 @@
             }
 
+
+
+
+
             $this->rewriter->consume();
         }
@@ -1450 +1454 @@
             $params                            = array();
         } elseif (
-            strpos( $updated_query, '@@SESSION.sql_mode' ) !== false
-            || strpos( $updated_query, 'CONVERT( ' ) !== false
+            // Examples: @@SESSION.sql_mode, @@GLOBAL.max_allowed_packet, @@character_set_client
+            preg_match( '/@@((SESSION|GLOBAL)\s*\.\s*)?\w+\b/i', $updated_query ) === 1 ||
+            strpos( $updated_query, 'CONVERT( ' ) !== false
         ) {
             /*
@@ -1492 +1497 @@
 
     /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      * Executes a TRUNCATE statement.
      */
@@ -1516 +1586 @@
         $this->rewriter->skip();
         $this->table_name = $this->rewriter->consume()->value;
-        $stmt             = $this->execute_sqlite_query(
+        $this->set_results_from_fetched_data(
+            $this->describe( $this->table_name )
+        );
+        if ( ! $this->results ) {
+            throw new PDOException( 'Table not found' );
+        }
+    }
+
+    /**
+     * Executes a SELECT statement.
+     *
+     * @param string $table_name The table name.
+     *
+     * @return array
+     */
+    private function describe( $table_name ) {
+        return $this->execute_sqlite_query(
             "SELECT
                 `name` as `Field`,
@@ -1525 +1611 @@
                     END
                 ) as `Null`,
-                IFNULL(
+                (
                     d.`mysql_type`,
                     (
@@ -1545 +1631 @@
                     END
                 ) as `Key`
-                FROM pragma_table_info(\"$this->table_name\") p
+                FROM pragma_table_info(\"$table_name\") p
                 LEFT JOIN " . self::DATA_TYPES_CACHE_TABLE . " d
-                ON d.`table` = \"$this->table_name\"
+                ON d.`table` = \"$table_name\"
                 AND d.`column_or_index` = p.`name`
                 ;
             "
-        );
-        $this->set_results_from_fetched_data(
-            $stmt->fetchAll( $this->pdo_fetch_mode )
-        );
-        if ( ! $this->results ) {
-            throw new PDOException( 'Table not found' );
-        }
+        )
+        ->fetchAll( $this->pdo_fetch_mode );
     }
 
     /**
      * Executes an UPDATE statement.
+
+
+
+
+
+
+
+
+
      */
     private function execute_update() {
-        $this->rewriter->consume(); // Update.
-
-        $params = array();
+        $this->rewriter->consume(); // Consume the UPDATE keyword.
+        $has_where                 = false;
+        $needs_closing_parenthesis = false;
+        $params                    = array();
         while ( true ) {
             $token = $this->rewriter->peek();
             if ( ! $token ) {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                 break;
             }
@@ -1595 +1717 @@
             $this->rewriter->consume();
         }
+
+
+
+
+
+
         $this->rewriter->consume_all();
 
@@ -1600 +1728 @@
         $this->execute_sqlite_query( $updated_query, $params );
         $this->set_result_from_affected_rows();
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 
@@ -3100 +3261 @@
             case 'COLUMNS FROM':
                 $table_name = $this->rewriter->consume()->token;
-                $stmt       = $this->execute_sqlite_query(
-                    "PRAGMA table_info(\"$table_name\");"
-                );
-                /* @todo we may need to add the Extra column if anybdy needs it. 'auto_increment' is the value */
-                $name_map = array(
-                    'name'       => 'Field',
-                    'type'       => 'Type',
-                    'dflt_value' => 'Default',
-                    'cid'        => null,
-                    'notnull'    => null,
-                    'pk'         => null,
-                );
-                $columns  = $stmt->fetchAll( $this->pdo_fetch_mode );
-                $columns  = array_map(
-                    function ( $row ) use ( $name_map ) {
-                        $new       = array();
-                        $is_object = is_object( $row );
-                        $row       = $is_object ? (array) $row : $row;
-                        foreach ( $row as $k => $v ) {
-                            $k = array_key_exists( $k, $name_map ) ? $name_map [ $k ] : $k;
-                            if ( $k ) {
-                                $new[ $k ] = $v;
-                            }
-                        }
-                        if ( array_key_exists( 'notnull', $row ) ) {
-                            $new['Null'] = ( '1' === $row ['notnull'] ) ? 'NO' : 'YES';
-                        }
-                        if ( array_key_exists( 'pk', $row ) ) {
-                            $new['Key'] = ( '1' === $row ['pk'] ) ? 'PRI' : '';
-                        }
-                        return $is_object ? (object) $new : $new;
-                    },
-                    $columns
-                );
-                $this->set_results_from_fetched_data( $columns );
+
+                $this->set_results_from_fetched_data( $this->get_columns_from( $table_name ) );
                 return;
 
@@ -3209 +3337 @@
                 return;
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
             case 'TABLE STATUS':  // FROM `database`.
-                // Match the optional [{FROM | IN} db_name]
+                // Match the optional [{FROM | IN} db_name]
                 $database_expression = $this->rewriter->consume();
-                if ( $database_expression->token === 'FROM' || $database_expression->token === 'IN' ) {
+                if (  ) {
                     $this->rewriter->consume();
                     $database_expression = $this->rewriter->consume();
@@ -3219 +3392 @@
                 $pattern = '%';
                 // [LIKE 'pattern' | WHERE expr]
-                if($database_expression->token === 'LIKE') {
+                if) {
                     $pattern = $this->rewriter->consume()->value;
-                } else if($database_expression->token === 'WHERE') {
+                } else) {
                     // @TODO Support me please.
-                } else if($database_expression->token !== ';') {
-                    throw new Exception( 'Syntax error: Unexpected token ' . $database_expression->token .' in query '. $this->mysql_query );
+                } else) {
+                    throw new Exception( 'Syntax error: Unexpected token ' . $database_expression->token .. $this->mysql_query );
                 }
 
@@ -3253 +3426 @@
                         AND name LIKE :pattern
                     ORDER BY name",
-
                     array(
                         ':pattern' => $pattern,
                     )
                 );
-                $tables = $this->strip_sqlite_system_tables( $stmt->fetchAll( $this->pdo_fetch_mode ) );
+                $tables = $this->strip_sqlite_system_tables( $stmt->fetchAll( $this->pdo_fetch_mode ) );
                 foreach ( $tables as $table ) {
                     $table_name  = $table->Name; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
@@ -3305 +3477 @@
                 }
         }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 

sqlite-database-integration/trunk/wp-includes/sqlite/install-functions.php

@@ -32 +32 @@
     }
 
-    $translator = new WP_SQLite_Translator( $pdo, $GLOBALS['table_prefix'] );
+    $translator = new WP_SQLite_Translator( $pdo );
     $query      = null;