Changeset 2888447

Timestamp:

03/28/2023 01:56:20 PM (3 years ago)

Author:

blockprotocol

Message:

update files in trunk to code for 0.0.6 release

Location:

blockprotocol/trunk

Files:

• block-protocol.php (modified) (3 diffs)
• changelog.txt (modified) (1 diff)
• readme.txt (modified) (4 diffs)
• server/block-api-endpoints.php (modified) (7 diffs)
• server/block-db-table.php (modified) (4 diffs)
• vendor/composer/autoload_psr4.php (modified) (1 diff)
• vendor/composer/autoload_static.php (modified) (2 diffs)
• vendor/composer/installed.php (modified) (2 diffs)

blockprotocol/trunk/block-protocol.php

@@ -2 +2 @@
 /**
  * @package blockprotocol
- * @version 0.0.5
+ * @version 0.0.6
  */
 /*
@@ -10 +10 @@
 Author: Block Protocol
 Author URI: https://blockprotocol.org/?utm_medium=organic&utm_source=wordpress_plugin-directory_blockprotocol-plugin_author-name
-Version: 0.0.5
+Version: 0.0.6
 Requires at least: 5.6.0
 Tested up to: 6.1.1
@@ -17 +17 @@
 */
 
-const BLOCK_PROTOCOL_PLUGIN_VERSION = "0.0.5";
+const BLOCK_PROTOCOL_PLUGIN_VERSION = "0.0.6";
 
 if (is_readable(__DIR__ . '/vendor/autoload.php')) {

blockprotocol/trunk/changelog.txt

@@ -1 +1 @@
 == Changelog ==
+
+= 0.0.6 =
+* Support older versions of MySQL (Minimum version is now 5.7.8 down from 8.0)
 
 = 0.0.5 =

blockprotocol/trunk/readme.txt

@@ -6 +6 @@
 Tested up to: 6.1.1
 Requires PHP: 7.4
-Stable tag: 0.0.5
+Stable tag: 0.0.6
 License: AGPL-3.0
 License URI: https://www.gnu.org/licenses/agpl-3.0.en.html
@@ -37 +37 @@
 **5.** If you want to add your own block to the plugin, visit https://blockprotocol.org/docs/developing-blocks
 
-Note that you must be using at least MySQL 8. To check please navigate to `Admin -> Tools -> Site Health -> Info -> Database`.
-The previous versions of MySQL (5.6 and 5.7) respectively reach(ed) end of life in February 2021 and October 2023. 
-You should upgrade to MySQL 8 now to continue to receive security updates, as well as to use the Block Protocol within WordPress.
+Note that you must be using at least MySQL 5.7.8. To check please navigate to `Admin -> Tools -> Site Health -> Info -> Database`.
+MySQL 5.6 and 5.7 respectively reach(ed) end of life in February 2021 and October 2023. 
+You should upgrade to MySQL 8 now to continue to receive security updates, as well as to get the best Block Protocol experience within WordPress.
 
 When you install or use the _Block Protocol for WordPress_ plugin, we don’t send any data to any third-party analytics services. 
@@ -85 +85 @@
 <!-- Only the latest release's entry should appear here – the full log should be in changelog.txt -->
 
-= 0.0.5 =
-* Handle blocks being inside an iFrame in editor view (fixes incompatibility with Gutenberg plugin)
+= 0.0.6 =
+* Support older versions of MySQL (Minimum version is now 5.7.8 down from 8.0)
 
 == Upgrade Notice ==
@@ -92 +92 @@
 <!-- Upgrade notices describe the reason a user should upgrade. No more than 300 characters. -->
 
-= 0.0.5 =
-Upgrade for compatibility with the Gutenberg plugin
+= 0.0.6 =
+Upgrade for support for older versions of MySQL (new minimum 5.7.8)

blockprotocol/trunk/server/block-api-endpoints.php

@@ -21 +21 @@
 }
 
-function get_block_protocol_subgraph(
-  string $base_where_term,
-  int $has_left_incoming_depth,
-  int $has_right_incoming_depth,
-  int $has_left_outgoing_depth,
-  int $has_right_outgoing_depth
-)
-{
-  global $wpdb;
-
-  $table = get_block_protocol_table_name();
-
-  $selection = "
+function block_protocol_entity_selection()
+{
+  return "
   entity_id,
   entity_type_id,
@@ -45 +35 @@
   updated_by_id,
   updated_at";
+
+}
+
+/**
+ * Natively traverse a subgraph using a base where term.
+ * This functions is meant to be as compatible as possible with various MySQL/MariaDB versions
+ */
+function block_protocol_native_subgraph_query(
+  string $base_where_term,
+  int $has_left_incoming_depth,
+  int $has_right_incoming_depth,
+  int $has_left_outgoing_depth,
+  int $has_right_outgoing_depth
+) {
+  global $wpdb;
+
+  $table = get_block_protocol_table_name();
+
+  $subgraph = [];
+  $queue = [];
+
+  // Initial query using the base where term
+  $selection = block_protocol_entity_selection();
+  $sql = $wpdb->prepare("
+    SELECT
+      " . $selection . ",
+      0 as has_left_incoming_depth,
+      0 as has_right_incoming_depth,
+      0 as has_left_outgoing_depth,
+      0 as has_right_outgoing_depth
+    FROM {$table}
+    " . $base_where_term
+  );
+
+  // Initialize the queue with the starting nodes
+  $queue = $wpdb->get_results($sql, ARRAY_A);
+
+  $visited = [];
+
+  // Loop while the queue is not empty
+  while (!empty($queue)) {
+    // Dequeue the next node
+    $node = array_shift($queue);
+
+    // Skip nodes that have already been visited
+    if ($visited[$node['entity_id']] ?? false) {
+        continue;
+    }
+
+    $visited[$node['entity_id']] = true;
+
+    // ensure that the depths are all ints
+    $node['has_left_incoming_depth'] = (int) $node['has_left_incoming_depth'];
+    $node['has_right_incoming_depth'] = (int) $node['has_right_incoming_depth'];
+    $node['has_left_outgoing_depth'] = (int) $node['has_left_outgoing_depth'];
+    $node['has_right_outgoing_depth'] = (int) $node['has_right_outgoing_depth'];
+
+    // Add the node to the result list
+    $subgraph[] = $node;
+
+    $next_nodes = [];
+
+    // Add nodes connected by incoming has_left links
+    if ($node['has_left_incoming_depth'] < $has_left_incoming_depth) {
+      $sql = $wpdb->prepare(
+        "SELECT
+          " . $selection . ",
+          %d + 1 as has_left_incoming_depth,
+          %d as has_right_incoming_depth,
+          %d as has_left_outgoing_depth,
+          %d as has_right_outgoing_depth
+        FROM {$table}
+        WHERE left_entity_id = %d
+        ",
+        $node['has_left_incoming_depth'],
+        $node['has_right_incoming_depth'],
+        $node["has_left_outgoing_depth"],
+        $node["has_right_outgoing_depth"],
+        $node['entity_id']
+      );
+
+      $next_nodes = array_merge($next_nodes, $wpdb->get_results($sql, ARRAY_A));
+    }
+
+    // Add nodes connected by incoming has_right links
+    if ($node['has_right_incoming_depth'] < $has_right_incoming_depth) {
+      $sql = $wpdb->prepare(
+        "SELECT
+          " . $selection . ",
+          %d as has_left_incoming_depth,
+          %d + 1 as has_right_incoming_depth,
+          %d as has_left_outgoing_depth,
+          %d as has_right_outgoing_depth
+        FROM {$table}
+        WHERE right_entity_id = %d
+        ",
+        $node['has_left_incoming_depth'],
+        $node['has_right_incoming_depth'],
+        $node["has_left_outgoing_depth"],
+        $node["has_right_outgoing_depth"],
+        $node['entity_id']
+      );
+
+      $next_nodes = array_merge($next_nodes, $wpdb->get_results($sql, ARRAY_A));
+    }
+
+    // Add nodes connected by outgoing has_left links
+    if ($node['has_left_outgoing_depth'] < $has_left_outgoing_depth) {
+      $sql = $wpdb->prepare(
+        "SELECT
+          " . $selection . ",
+          %d as has_left_incoming_depth,
+          %d as has_right_incoming_depth,
+          %d + 1 as has_left_outgoing_depth,
+          %d as has_right_outgoing_depth
+        FROM {$table}
+        WHERE entity_id = %d
+        ",
+        $node['has_left_incoming_depth'],
+        $node['has_right_incoming_depth'],
+        $node["has_left_outgoing_depth"],
+        $node["has_right_outgoing_depth"],
+        $node['left_entity_id']
+      );
+
+      $next_nodes = array_merge($next_nodes, $wpdb->get_results($sql, ARRAY_A));
+    }
+
+    // Add nodes connected by outgoing has_right links
+    if ($node['has_right_outgoing_depth'] < $has_right_outgoing_depth) {
+      $sql = $wpdb->prepare(
+        "SELECT
+          " . $selection . ",
+          %d as has_left_incoming_depth,
+          %d as has_right_incoming_depth,
+          %d as has_left_outgoing_depth,
+          %d + 1 as has_right_outgoing_depth
+        FROM {$table}
+        WHERE entity_id = %d
+        ",
+        $node['has_left_incoming_depth'],
+        $node['has_right_incoming_depth'],
+        $node["has_left_outgoing_depth"],
+        $node["has_right_outgoing_depth"],
+        $node['right_entity_id']
+      );
+
+      $next_nodes = array_merge($next_nodes, $wpdb->get_results($sql, ARRAY_A));
+    }
+
+    // Add the next nodes to the queue
+    foreach ($next_nodes as $next_node)  {
+      $entity_id = $next_node['entity_id'];
+
+      if (!($visited[$entity_id] ?? false)) {
+        $queue[] = $next_node;
+      }
+    }
+  }
+
+  foreach($subgraph as &$element) {
+    unset($element["has_left_incoming_depth"]);
+    unset($element["has_right_incoming_depth"]);
+    unset($element["has_left_outgoing_depth"]);
+    unset($element["has_right_outgoing_depth"]);
+  }
+
+  return $subgraph;
+}
+
+
+/**
+ * Traverse a subgraph using Recursive CTEs in the DB.
+ * This functions is likely unsupported by older versions of the DB.
+ */
+function block_protocol_db_subgraph_query(
+  string $base_where_term,
+  int $has_left_incoming_depth,
+  int $has_right_incoming_depth,
+  int $has_left_outgoing_depth,
+  int $has_right_outgoing_depth
+)
+{
+  global $wpdb;
+
+  $table = get_block_protocol_table_name();
+
+  $selection = block_protocol_entity_selection();
 
   $sql = $wpdb->prepare(
@@ -78 +256 @@
         has_left_outgoing_depth,
         has_right_outgoing_depth
-    FROM {$table} e2 
-    JOIN linked_entities 
+    FROM {$table} e2
+    JOIN linked_entities
       ON e2.left_entity_id = linked_entities.entity_id
     WHERE has_left_incoming_depth < %d
@@ -102 +280 @@
         has_left_outgoing_depth,
         has_right_outgoing_depth
-    FROM {$table} e2 
-    JOIN linked_entities 
+    FROM {$table} e2
+    JOIN linked_entities
       ON e2.right_entity_id = linked_entities.entity_id
     WHERE has_right_incoming_depth < %d
@@ -126 +304 @@
         has_left_outgoing_depth +1,
         has_right_outgoing_depth
-    FROM {$table} e2 
-    JOIN linked_entities 
+    FROM {$table} e2
+    JOIN linked_entities
       ON e2.entity_id = linked_entities.left_entity_id
     WHERE has_left_outgoing_depth < %d
@@ -150 +328 @@
         has_left_outgoing_depth,
         has_right_outgoing_depth + 1
-    FROM {$table} e2 
-    JOIN linked_entities 
+    FROM {$table} e2
+    JOIN linked_entities
       ON e2.entity_id = linked_entities.right_entity_id
     WHERE has_right_outgoing_depth < %d
@@ -166 +344 @@
 
   $subgraph = $wpdb->get_results($sql, ARRAY_A);
+
+  return $subgraph;
+}
+
+function get_block_protocol_subgraph(
+  string $base_where_term,
+  int $has_left_incoming_depth,
+  int $has_right_incoming_depth,
+  int $has_left_outgoing_depth,
+  int $has_right_outgoing_depth
+)
+{
+  global $wpdb;
+  // See https://dev.mysql.com/doc/refman/8.0/en/mysql-nutshell.html
+  $mysql_recursive_cte_version = "8.0";
+  // See https://mariadb.com/kb/en/mariadb-1022-release-notes/#notable-changes
+  $mariadb_recursive_cte_version = "10.2.2";
+
+  // Dynamically choose how to execute the query based on the database version
+  $action =
+    block_protocol_database_at_version(
+      $mysql_recursive_cte_version,
+      $mariadb_recursive_cte_version
+    )
+    ? "block_protocol_db_subgraph_query"
+    : "block_protocol_native_subgraph_query";
+
+  $subgraph = ($action)(
+    $base_where_term,
+    $has_left_incoming_depth,
+    $has_right_incoming_depth,
+    $has_left_outgoing_depth,
+    $has_right_outgoing_depth,
+  );
 
   block_protocol_maybe_capture_error($wpdb->last_error);

blockprotocol/trunk/server/block-db-table.php

@@ -1 +1 @@
 <?php
 
-const BLOCK_PROTOCOL_MINIMUM_MYSQL_VERSION = "8.0.0";
+const BLOCK_PROTOCOL_MINIMUM_MYSQL_VERSION = "5.7.8";
 const BLOCK_PROTOCOL_MINIMUM_MARIADB_VERSION = "10.2.7";
 
-function block_protocol_is_database_supported()
+function block_protocol_database_at_version(string $mysql_version, string $mariadb_version)
 {
+
   global $wpdb;
   
@@ -13 +14 @@
   if (strpos($db_server_info, 'MariaDB') != false) {
     // site is using MariaDB
-    return $db_version >= BLOCK_PROTOCOL_MINIMUM_MARIADB_VERSION;
+    return strnatcmp($db_version, $mariadb_version) > 0;
   } else {
     // site is using MySQL
-    return $db_version >= BLOCK_PROTOCOL_MINIMUM_MYSQL_VERSION;
+    return strnatcmp($db_version, $mysql_version) > 0;
   }
+}
+
+function block_protocol_is_database_supported()
+{
+  return block_protocol_database_at_version(
+    BLOCK_PROTOCOL_MINIMUM_MYSQL_VERSION,
+    BLOCK_PROTOCOL_MINIMUM_MARIADB_VERSION
+  );
 }
 
@@ -55 +64 @@
 }
 
+function block_protocol_set_migration_version_to(int $migration_version)
+{
+  global $wpdb;
+
+  if (!$wpdb->last_error){
+    update_site_option('block_protocol_db_migration_version', $migration_version);
+  }
+}
+
 function block_protocol_migrate()
 {
@@ -66 +84 @@
   if ($saved_version < 2) {
     block_protocol_migration_1();
-    update_site_option('block_protocol_db_migration_version', 2);
+    block_protocol_set_migration_version_to(2);
   }
 

blockprotocol/trunk/vendor/composer/autoload_psr4.php

@@ -15 +15 @@
     'Sentry\\' => array($vendorDir . '/sentry/sentry/src'),
     'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
-    'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src', $vendorDir . '/psr/http-factory/src'),
+    'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-factory/src', $vendorDir . '/psr/http-message/src'),
     'Psr\\Http\\Client\\' => array($vendorDir . '/psr/http-client/src'),
     'Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
     'Jean85\\' => array($vendorDir . '/jean85/pretty-package-versions/src'),
     'Http\\Promise\\' => array($vendorDir . '/php-http/promise/src'),
-    'Http\\Message\\' => array($vendorDir . '/php-http/message-factory/src', $vendorDir . '/php-http/message/src'),
+    'Http\\Message\\' => array($vendorDir . '/php-http/message/src', $vendorDir . '/php-http/message-factory/src'),
     'Http\\Factory\\Guzzle\\' => array($vendorDir . '/http-interop/http-factory-guzzle/src'),
     'Http\\Discovery\\' => array($vendorDir . '/php-http/discovery/src'),

blockprotocol/trunk/vendor/composer/autoload_static.php

@@ -95 +95 @@
         'Psr\\Http\\Message\\' => 
         array (
-            0 => __DIR__ . '/..' . '/psr/http-message/src',
-            1 => __DIR__ . '/..' . '/psr/http-factory/src',
+            0 => __DIR__ . '/..' . '/psr/http-factory/src',
+            1 => __DIR__ . '/..' . '/psr/http-message/src',
         ),
         'Psr\\Http\\Client\\' => 
@@ -116 +116 @@
         'Http\\Message\\' => 
         array (
-            0 => __DIR__ . '/..' . '/php-http/message-factory/src',
-            1 => __DIR__ . '/..' . '/php-http/message/src',
+            0 => __DIR__ . '/..' . '/php-http/message/src',
+            1 => __DIR__ . '/..' . '/php-http/message-factory/src',
         ),
         'Http\\Factory\\Guzzle\\' => 

blockprotocol/trunk/vendor/composer/installed.php

@@ -4 +4 @@
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-        'reference' => '0cfe96ccb03939381934792c133c29a90db1ff14',
+        'reference' => '73f2ebf03d03a41d55d3ab999e367d0fd7ca22c2',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -14 +14 @@
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => '0cfe96ccb03939381934792c133c29a90db1ff14',
+            'reference' => '73f2ebf03d03a41d55d3ab999e367d0fd7ca22c2',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',