From 895ce98222435e17eda25e6ac6f68e0921ef30cc Mon Sep 17 00:00:00 2001
From: Davey Shafik <davey@php.net>
Date: Tue, 27 Oct 2020 09:53:26 +0000
Subject: s/varchar/string

---
 lib/mysql.php           |  2 +-
 tests/MySqlShimTest.php | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/mysql.php b/lib/mysql.php
index 95f6e2b..edeae96 100644
--- a/lib/mysql.php
+++ b/lib/mysql.php
@@ -497,7 +497,7 @@ namespace {
                         $res->type = 'blob';
                         break;
                     case MYSQLI_TYPE_VAR_STRING: 
-                        $res->type = 'varchar';
+                        $res->type = 'string';
                         break;
                     case MYSQLI_TYPE_STRING: 
                         $res->type = 'char';
diff --git a/tests/MySqlShimTest.php b/tests/MySqlShimTest.php
index 71c5c0a..a39ac1f 100644
--- a/tests/MySqlShimTest.php
+++ b/tests/MySqlShimTest.php
@@ -984,42 +984,42 @@ class MySqlShimTest extends \Yoast\PHPUnitPolyfills\TestCases\TestCase
             1 => array(
                 'name' => 'one', 'max_length' => 3, 'not_null' => 0, 'primary_key' => 0,
                 'unique_key' => 0, 'multiple_key' => 1, 'numeric' => 0, 'blob' => 0,
-                'type' => 'varchar', 'unsigned' => 0, 'zerofill' => 0
+                'type' => 'string', 'unsigned' => 0, 'zerofill' => 0
             ),
             2 => array(
                 'name' => 'two', 'max_length' => 1, 'not_null' => 0, 'primary_key' => 0,
                 'unique_key' => 1, 'multiple_key' => 0, 'numeric' => 0, 'blob' => 0,
-                'type' => 'varchar', 'unsigned' => 0, 'zerofill' => 0
+                'type' => 'string', 'unsigned' => 0, 'zerofill' => 0
             ),
             3 => array(
                 'name' => 'three', 'max_length' => 1, 'not_null' => 0, 'primary_key' => 0,
                 'unique_key' => 0, 'multiple_key' => 1, 'numeric' => 0, 'blob' => 0,
-                'type' => 'varchar', 'unsigned' => 0, 'zerofill' => 0
+                'type' => 'string', 'unsigned' => 0, 'zerofill' => 0
             ),
             4 => array(
                 'name' => 'four', 'max_length' => 1, 'not_null' => 0, 'primary_key' => 0,
                 'unique_key' => 0, 'multiple_key' => 1, 'numeric' => 0, 'blob' => 0,
-                'type' => 'varchar', 'unsigned' => 0, 'zerofill' => 0
+                'type' => 'string', 'unsigned' => 0, 'zerofill' => 0
             ),
             5 => array(
                 'name' => 'five', 'max_length' => 1, 'not_null' => 0, 'primary_key' => 0,
                 'unique_key' => 0, 'multiple_key' => 0, 'numeric' => 0, 'blob' => 0,
-                'type' => 'varchar', 'unsigned' => 0, 'zerofill' => 0
+                'type' => 'string', 'unsigned' => 0, 'zerofill' => 0
             ),
             6 => array(
                 'name' => 'six', 'max_length' => 1, 'not_null' => 0, 'primary_key' => 0,
                 'unique_key' => 0, 'multiple_key' => 0, 'numeric' => 0, 'blob' => 0,
-                'type' => 'varchar', 'unsigned' => 0, 'zerofill' => 0
+                'type' => 'string', 'unsigned' => 0, 'zerofill' => 0
             ),
             7 => array(
                 'name' => 'seven', 'max_length' => 1, 'not_null' => 0, 'primary_key' => 0,
                 'unique_key' => 0, 'multiple_key' => 1, 'numeric' => 0, 'blob' => 0,
-                'type' => 'varchar', 'unsigned' => 0, 'zerofill' => 0
+                'type' => 'string', 'unsigned' => 0, 'zerofill' => 0
             ),
             8 => array(
                 'name' => 'eight', 'max_length' => 1, 'not_null' => 0, 'primary_key' => 0,
                 'unique_key' => 0, 'multiple_key' => 0, 'numeric' => 0, 'blob' => 0,
-                'type' => 'varchar', 'unsigned' => 0, 'zerofill' => 0
+                'type' => 'string', 'unsigned' => 0, 'zerofill' => 0
             ),
             9 => array(
                 'name' => 'nine', 'max_length' => 3, 'not_null' => 0, 'primary_key' => 0,
-- 
cgit v1.1