Shrink the length of some DB columns to 191 characters for compatibil…

…ity with old MySQL versions.
parpalak · May 3, 2024 · 2fb9382 · 2fb9382
1 parent 6394d66
commit 2fb9382
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/test_mysql.yml b/.github/workflows/test_mysql.yml
@@ -23,6 +23,7 @@ jobs:
           - 'mariadb-11.1'
           - 'mariadb-11.2'
           - 'mariadb-11.3'
+          - 'mariadb-11.4'
           - '8.0'
           - '8.2'
           - '8.3'
@@ -63,4 +64,4 @@ jobs:
 
       - name: Output logs
         if: failure()
-        run: cat _cache/test/*.log && cat _tests/_output/email/*.txt
+        run: cat _cache/test/*.log && cat _tests/_output/email/*.txt && /home/runner/work/s2/s2/_tests/_output/
diff --git a/.github/workflows/test_postgres.yml b/.github/workflows/test_postgres.yml
@@ -48,4 +48,4 @@ jobs:
 
       - name: Output logs
         if: failure()
-        run: cat _cache/test/*.log && cat _tests/_output/email/*.txt
+        run: cat _cache/test/*.log && cat _tests/_output/email/*.txt && /home/runner/work/s2/s2/_tests/_output/
diff --git a/.github/workflows/test_sqlite.yml b/.github/workflows/test_sqlite.yml
@@ -40,4 +40,4 @@ jobs:
 
       - name: Output logs
         if: failure()
-        run: cat _cache/test/*.log && cat _tests/_output/email/*.txt
+        run: cat _cache/test/*.log && cat _tests/_output/email/*.txt && /home/runner/work/s2/s2/_tests/_output/
diff --git a/_admin/tags.php b/_admin/tags.php
@@ -148,7 +148,7 @@ function s2_output_tag_form ($tag, $modify_time)
 <?php ($hook = s2_hook('fn_output_tag_form_pre_name')) ? eval($hook) : null; ?>
 			<tr>
 				<td class="label"><?php echo $lang_admin['Tag']; ?></td>
-				<td><input type="text" name="tag[name]" size="50" maxlength="255" value="<?php echo s2_htmlencode($tag['name']); ?>" /></td>
+				<td><input type="text" name="tag[name]" size="50" maxlength="191" value="<?php echo s2_htmlencode($tag['name']); ?>" /></td>
 			</tr>
 <?php ($hook = s2_hook('fn_output_tag_form_pre_time')) ? eval($hook) : null; ?>
 			<tr>
@@ -169,7 +169,7 @@ function s2_output_tag_form ($tag, $modify_time)
         <?php ($hook = s2_hook('fn_output_tag_form_pre_url')) ? eval($hook) : null; ?>
         <?php echo $lang_admin['URL part']; ?>
         <br />
-        <input type="text" name="tag[url]" size="18" maxlength="255" value="<?php echo $tag['url']; ?>" />
+        <input type="text" name="tag[url]" size="18" maxlength="191" value="<?php echo $tag['url']; ?>" />
         <br />
         <?php ($hook = s2_hook('fn_output_tag_form_pre_replace_tag')) ? eval($hook) : null; ?>
         <?php echo $lang_admin['Replace tag']; ?>

diff --git a/_include/src/Model/Installer.php b/_include/src/Model/Installer.php
@@ -27,7 +27,7 @@ public function createTables(): void
         $schema = array(
             'FIELDS'      => array(
                 'name'  => array(
-                    'datatype'   => 'VARCHAR(255)',
+                    'datatype'   => 'VARCHAR(191)',
                     'allow_null' => false,
                     'default'    => '\'\''
                 ),
@@ -270,7 +270,7 @@ public function createTables(): void
                     'allow_null' => false
                 ),
                 'name'        => array(
-                    'datatype'   => 'VARCHAR(255)',
+                    'datatype'   => 'VARCHAR(191)',
                     'allow_null' => false,
                     'default'    => '\'\''
                 ),
@@ -284,7 +284,7 @@ public function createTables(): void
                     'default'    => '0'
                 ),
                 'url'         => array(
-                    'datatype'   => 'VARCHAR(255)',
+                    'datatype'   => 'VARCHAR(191)',
                     'allow_null' => false,
                     'default'    => '\'\''
                 ),
@@ -344,7 +344,7 @@ public function createTables(): void
                     'default'    => '0'
                 ),
                 'login'          => array(
-                    'datatype'   => 'VARCHAR(200)',
+                    'datatype'   => 'VARCHAR(191)',
                     'allow_null' => true
                 ),
                 'ip'             => array(
@@ -379,7 +379,7 @@ public function createTables(): void
                     'allow_null' => false
                 ),
                 'login'           => array(
-                    'datatype'   => 'VARCHAR(200)',
+                    'datatype'   => 'VARCHAR(191)',
                     'allow_null' => false,
                     'default'    => '\'\''
                 ),