From dc81c1375c349c788bca5b5dcd4df59e00c066af Mon Sep 17 00:00:00 2001 From: Jaapio Date: Fri, 10 Jan 2025 17:30:31 +0100 Subject: [PATCH] [FIX] colspan reset Colspan needs to be reset every row. --- .../Productions/Table/GridTableBuilder.php | 2 +- .../table-grid-col-span.html} | 6 + .../table-grid-col-span.rst} | 2 + .../table-grid-complex-row-span.html} | 0 .../table-grid-complex-row-span.rst} | 0 .../table-grid-error1.html} | 0 .../table-grid-error1.rst} | 0 .../table-grid-header.html} | 0 .../table-grid-header.rst} | 0 .../table-grid-large/table-grid-large.html | 543 ++++++++++++++++++ .../table-grid-large/table-grid-large.rst | 226 ++++++++ .../table-grid-multiline-header.html} | 0 .../table-grid-multiline-header.rst} | 0 .../table-grid-no-header.html} | 0 .../table-grid-no-header.rst} | 0 .../table-grid-row-span.html} | 0 .../table-grid-row-span.rst} | 0 17 files changed, 778 insertions(+), 1 deletion(-) rename tests/Functional/tests/{pretty-table-col-span/pretty-table-col-span.html => table-grid-col-span/table-grid-col-span.html} (76%) rename tests/Functional/tests/{pretty-table-col-span/pretty-table-col-span.rst => table-grid-col-span/table-grid-col-span.rst} (80%) rename tests/Functional/tests/{pretty-table-complex-row-span/pretty-table-complex-row-span.html => table-grid-complex-row-span/table-grid-complex-row-span.html} (100%) rename tests/Functional/tests/{pretty-table-complex-row-span/pretty-table-complex-row-span.rst => table-grid-complex-row-span/table-grid-complex-row-span.rst} (100%) rename tests/Functional/tests/{pretty-table-error1/pretty-table-error1.html => table-grid-error1/table-grid-error1.html} (100%) rename tests/Functional/tests/{pretty-table-error1/pretty-table-error1.rst => table-grid-error1/table-grid-error1.rst} (100%) rename tests/Functional/tests/{pretty-table-header/pretty-table-header.html => table-grid-header/table-grid-header.html} (100%) rename tests/Functional/tests/{pretty-table-header/pretty-table-header.rst => table-grid-header/table-grid-header.rst} (100%) create mode 100644 tests/Functional/tests/table-grid-large/table-grid-large.html create mode 100644 tests/Functional/tests/table-grid-large/table-grid-large.rst rename tests/Functional/tests/{pretty-table-multiline-header/pretty-table-multiline-header.html => table-grid-multiline-header/table-grid-multiline-header.html} (100%) rename tests/Functional/tests/{pretty-table-multiline-header/pretty-table-multiline-header.rst => table-grid-multiline-header/table-grid-multiline-header.rst} (100%) rename tests/Functional/tests/{pretty-table-no-header/pretty-table-no-header.html => table-grid-no-header/table-grid-no-header.html} (100%) rename tests/Functional/tests/{pretty-table-no-header/pretty-table-no-header.rst => table-grid-no-header/table-grid-no-header.rst} (100%) rename tests/Functional/tests/{pretty-table-row-span/pretty-table-row-span.html => table-grid-row-span/table-grid-row-span.html} (100%) rename tests/Functional/tests/{pretty-table-row-span/pretty-table-row-span.rst => table-grid-row-span/table-grid-row-span.rst} (100%) diff --git a/packages/guides-restructured-text/src/RestructuredText/Parser/Productions/Table/GridTableBuilder.php b/packages/guides-restructured-text/src/RestructuredText/Parser/Productions/Table/GridTableBuilder.php index 8a17cd9ed..30c4434b6 100644 --- a/packages/guides-restructured-text/src/RestructuredText/Parser/Productions/Table/GridTableBuilder.php +++ b/packages/guides-restructured-text/src/RestructuredText/Parser/Productions/Table/GridTableBuilder.php @@ -67,7 +67,7 @@ private function extractTableRows(ParserContext $context): array } /** @param array $columnRanges */ - private function extractRow(array $columnRanges, string $line, int &$currentSpan): TableRow + private function extractRow(array $columnRanges, string $line, int $currentSpan): TableRow { $row = new TableRow(); $currentColumnStart = null; diff --git a/tests/Functional/tests/pretty-table-col-span/pretty-table-col-span.html b/tests/Functional/tests/table-grid-col-span/table-grid-col-span.html similarity index 76% rename from tests/Functional/tests/pretty-table-col-span/pretty-table-col-span.html rename to tests/Functional/tests/table-grid-col-span/table-grid-col-span.html index facf927f8..7b2d26b30 100644 --- a/tests/Functional/tests/pretty-table-col-span/pretty-table-col-span.html +++ b/tests/Functional/tests/table-grid-col-span/table-grid-col-span.html @@ -18,5 +18,11 @@ body row 2 Cells may span columns. + + body row 1, column 1 + column 2 + column 3 + column 4 + diff --git a/tests/Functional/tests/pretty-table-col-span/pretty-table-col-span.rst b/tests/Functional/tests/table-grid-col-span/table-grid-col-span.rst similarity index 80% rename from tests/Functional/tests/pretty-table-col-span/pretty-table-col-span.rst rename to tests/Functional/tests/table-grid-col-span/table-grid-col-span.rst index bbae9777f..1ab85b2fa 100644 --- a/tests/Functional/tests/pretty-table-col-span/pretty-table-col-span.rst +++ b/tests/Functional/tests/table-grid-col-span/table-grid-col-span.rst @@ -6,3 +6,5 @@ +------------------------+------------+----------+----------+ | body row 2 | Cells may span columns. | +------------------------+----------------------------------+ +| body row 1, column 1 | column 2 | column 3 | column 4 | ++------------------------+------------+----------+----------+ diff --git a/tests/Functional/tests/pretty-table-complex-row-span/pretty-table-complex-row-span.html b/tests/Functional/tests/table-grid-complex-row-span/table-grid-complex-row-span.html similarity index 100% rename from tests/Functional/tests/pretty-table-complex-row-span/pretty-table-complex-row-span.html rename to tests/Functional/tests/table-grid-complex-row-span/table-grid-complex-row-span.html diff --git a/tests/Functional/tests/pretty-table-complex-row-span/pretty-table-complex-row-span.rst b/tests/Functional/tests/table-grid-complex-row-span/table-grid-complex-row-span.rst similarity index 100% rename from tests/Functional/tests/pretty-table-complex-row-span/pretty-table-complex-row-span.rst rename to tests/Functional/tests/table-grid-complex-row-span/table-grid-complex-row-span.rst diff --git a/tests/Functional/tests/pretty-table-error1/pretty-table-error1.html b/tests/Functional/tests/table-grid-error1/table-grid-error1.html similarity index 100% rename from tests/Functional/tests/pretty-table-error1/pretty-table-error1.html rename to tests/Functional/tests/table-grid-error1/table-grid-error1.html diff --git a/tests/Functional/tests/pretty-table-error1/pretty-table-error1.rst b/tests/Functional/tests/table-grid-error1/table-grid-error1.rst similarity index 100% rename from tests/Functional/tests/pretty-table-error1/pretty-table-error1.rst rename to tests/Functional/tests/table-grid-error1/table-grid-error1.rst diff --git a/tests/Functional/tests/pretty-table-header/pretty-table-header.html b/tests/Functional/tests/table-grid-header/table-grid-header.html similarity index 100% rename from tests/Functional/tests/pretty-table-header/pretty-table-header.html rename to tests/Functional/tests/table-grid-header/table-grid-header.html diff --git a/tests/Functional/tests/pretty-table-header/pretty-table-header.rst b/tests/Functional/tests/table-grid-header/table-grid-header.rst similarity index 100% rename from tests/Functional/tests/pretty-table-header/pretty-table-header.rst rename to tests/Functional/tests/table-grid-header/table-grid-header.rst diff --git a/tests/Functional/tests/table-grid-large/table-grid-large.html b/tests/Functional/tests/table-grid-large/table-grid-large.html new file mode 100644 index 000000000..e8a6057d2 --- /dev/null +++ b/tests/Functional/tests/table-grid-large/table-grid-large.html @@ -0,0 +1,543 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DoctrinePHPDatabase vendor
NameVersionType
smallintintegerMySQLallSMALLINT UNSIGNED [10] AUTO_INCREMENT [11]
PostgreSQLallSMALLINT
OracleallNUMBER(5)
SQL ServerallSMALLINT IDENTITY [11]
SQLiteallINTEGER [15]
integerintegerMySQLallINT UNSIGNED [10] AUTO_INCREMENT [11]
PostgreSQLallINT [12]
SERIAL [11]
OracleallNUMBER(10)
SQL ServerallINT IDENTITY [11]
SQLiteallINTEGER [15]
bigintstring [8]MySQLallBIGINT UNSIGNED [10] AUTO_INCREMENT [11]
PostgreSQLallBIGINT [12]
BIGSERIAL [11]
OracleallNUMBER(20)
SQL ServerallBIGINT IDENTITY [11]
SQLiteallINTEGER [15]
decimal [7]string [9]MySQLallNUMERIC(p, s) UNSIGNED [10]
PostgreSQLallNUMERIC(p, s)
Oracle
SQL Server
SQLite
number [7]\BCMath\Number +[9]MySQLallNUMERIC(p, s) UNSIGNED [10]
PostgreSQLallNUMERIC(p, s)
Oracle
SQL Server
SQLite
smallfloatfloatMySQLallFLOAT UNSIGNED [10]
PostgreSQLallREAL
Oracle
SQL Server
SQLite
floatfloatMySQLallDOUBLE PRECISION UNSIGNED [10]
PostgreSQLallDOUBLE PRECISION
Oracle
SQL Server
SQLite
string +[2] [5]stringMySQLallVARCHAR(n) [3]
PostgreSQL
SQLite 
OracleallVARCHAR2(n) [3]
CHAR(n) [4]
SQL ServerallNVARCHAR(n) [3]
NCHAR(n) [4]
ascii_stringstringSQL Server VARCHAR(n) +CHAR(n)
textstringMySQLallTINYTEXT [16]
TEXT [17]
MEDIUMTEXT [18]
LONGTEXT [19]
PostgreSQL +

all

+

all

+ 		+

TEXT

+

CLOB

+
Oracle
SQLite
SQL ServerallVARCHAR(MAX)
guidstringMySQLallCHAR(36) [1]
Oracle
SQLite
SQL Server +

all

+

all

+ 		+

UNIQUEIDENTIFIER

+

UUID

+
PostgreSQL
binary +[2] [6]resourceMySQL +

all

+

all

+ 		VARBINARY(n) [3]
SQL ServerBINARY(n) [4]
OracleRAW(n)
PostgreSQLallBYTEA [15]
SQLiteallBLOB [15]
blobresourceMySQLallTINYBLOB [16]
BLOB [17]
MEDIUMBLOB [18]
LONGBLOB [19]
OracleallBLOB
SQLite
SQL ServerallVARBINARY(MAX)
PostgreSQLallBYTEA
booleanbooleanMySQLallTINYINT(1)
PostgreSQLallBOOLEAN
SQLite
SQL Server +

all

+

all

+ 		+

BIT

+

NUMBER(1)

+
Oracle
date\DateTimeMySQLallDATE
PostgreSQL
Oracle
SQLite
SQL Server"all"
datetime\DateTimeMySQLallDATETIME [13]
SQL ServerallDATETIME
SQLite
PostgreSQLallTIMESTAMP(0) WITHOUT TIME ZONE
OracleallTIMESTAMP(0)
datetimetz\DateTimeMySQLallDATETIME [14] [15]
SQLite
SQL Server"all"
PostgreSQLallTIMESTAMP(0) WITH TIME ZONE
Oracle
time\DateTimeMySQLallTIME
SQLite
PostgreSQLallTIME(0) WITHOUT TIME ZONE
OracleallDATE [15]
SQL Server"all"TIME(0)
simple array +[1]arrayMySQLallTINYTEXT [16]
TEXT [17]
MEDIUMTEXT [18]
LONGTEXT [19]
PostgreSQL +

all

+

all

+ 		+

TEXT

+

CLOB

+
Oracle
SQLite
SQL ServerallVARCHAR(MAX)
jsonmixedMySQLallJSON
PostgreSQLallJSON [20]
JSONB [21]
OracleallCLOB [1]
SQLite
SQL ServerallVARCHAR(MAX) [1]
diff --git a/tests/Functional/tests/table-grid-large/table-grid-large.rst b/tests/Functional/tests/table-grid-large/table-grid-large.rst new file mode 100644 index 000000000..46b9739d7 --- /dev/null +++ b/tests/Functional/tests/table-grid-large/table-grid-large.rst @@ -0,0 +1,226 @@ ++-------------------+--------------------+--------------------------+---------+----------------------------------------------------------+ +| Doctrine | PHP | Database vendor | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | Name | Version | Type | ++===================+====================+==========================+=========+==========================================================+ +| **smallint** | ``integer`` | **MySQL** | *all* | ``SMALLINT`` ``UNSIGNED`` [10] ``AUTO_INCREMENT`` [11] | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **PostgreSQL** | *all* | ``SMALLINT`` | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **Oracle** | *all* | ``NUMBER(5)`` | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **SQL Server** | *all* | ``SMALLINT`` ``IDENTITY`` [11] | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **SQLite** | *all* | ``INTEGER`` [15] | ++-------------------+--------------------+--------------------------+---------+----------------------------------------------------------+ +| **integer** | ``integer`` | **MySQL** | *all* | ``INT`` ``UNSIGNED`` [10] ``AUTO_INCREMENT`` [11] | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **PostgreSQL** | *all* | ``INT`` [12] | +| | | | +----------------------------------------------------------+ +| | | | | ``SERIAL`` [11] | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **Oracle** | *all* | ``NUMBER(10)`` | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **SQL Server** | *all* | ``INT`` ``IDENTITY`` [11] | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **SQLite** | *all* | ``INTEGER`` [15] | ++-------------------+--------------------+--------------------------+---------+----------------------------------------------------------+ +| **bigint** | ``string`` [8] | **MySQL** | *all* | ``BIGINT`` ``UNSIGNED`` [10] ``AUTO_INCREMENT`` [11] | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **PostgreSQL** | *all* | ``BIGINT`` [12] | +| | | | +----------------------------------------------------------+ +| | | | | ``BIGSERIAL`` [11] | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **Oracle** | *all* | ``NUMBER(20)`` | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **SQL Server** | *all* | ``BIGINT`` ``IDENTITY`` [11] | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **SQLite** | *all* | ``INTEGER`` [15] | ++-------------------+--------------------+--------------------------+---------+----------------------------------------------------------+ +| **decimal** [7] | ``string`` [9] | **MySQL** | *all* | ``NUMERIC(p, s)`` ``UNSIGNED`` [10] | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **PostgreSQL** | *all* | ``NUMERIC(p, s)`` | +| | +--------------------------+ | | +| | | **Oracle** | | | +| | +--------------------------+ | | +| | | **SQL Server** | | | +| | +--------------------------+ | | +| | | **SQLite** | | | ++-------------------+--------------------+--------------------------+---------+----------------------------------------------------------+ +| **number** [7] | ``\BCMath\Number`` | **MySQL** | *all* | ``NUMERIC(p, s)`` ``UNSIGNED`` [10] | +| | [9] +--------------------------+---------+----------------------------------------------------------+ +| | | **PostgreSQL** | *all* | ``NUMERIC(p, s)`` | +| | +--------------------------+ | | +| | | **Oracle** | | | +| | +--------------------------+ | | +| | | **SQL Server** | | | +| | +--------------------------+ | | +| | | **SQLite** | | | ++-------------------+--------------------+--------------------------+---------+----------------------------------------------------------+ +| **smallfloat** | ``float`` | **MySQL** | *all* | ``FLOAT`` ``UNSIGNED`` [10] | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **PostgreSQL** | *all* | ``REAL`` | +| | +--------------------------+ | | +| | | **Oracle** | | | +| | +--------------------------+ | | +| | | **SQL Server** | | | +| | +--------------------------+ | | +| | | **SQLite** | | | ++-------------------+--------------------+--------------------------+---------+----------------------------------------------------------+ +| **float** | ``float`` | **MySQL** | *all* | ``DOUBLE PRECISION`` ``UNSIGNED`` [10] | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **PostgreSQL** | *all* | ``DOUBLE PRECISION`` | +| | +--------------------------+ | | +| | | **Oracle** | | | +| | +--------------------------+ | | +| | | **SQL Server** | | | +| | +--------------------------+ | | +| | | **SQLite** | | | ++-------------------+--------------------+--------------------------+---------+----------------------------------------------------------+ +| **string** | ``string`` | **MySQL** | *all* | ``VARCHAR(n)`` [3] | +| [2] [5] | +--------------------------+ | | +| | | **PostgreSQL** | | | +| | +--------------------------+ +----------------------------------------------------------+ +| | | **SQLite** | | | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **Oracle** | *all* | ``VARCHAR2(n)`` [3] | +| | | | +----------------------------------------------------------+ +| | | | | ``CHAR(n)`` [4] | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **SQL Server** | *all* | ``NVARCHAR(n)`` [3] | +| | | | +----------------------------------------------------------+ +| | | | | ``NCHAR(n)`` [4] | ++-------------------+--------------------+--------------------------+---------+----------------------------------------------------------+ +| **ascii_string** | ``string`` | **SQL Server** | | ``VARCHAR(n)`` | +| | | | | ``CHAR(n)`` | ++-------------------+--------------------+--------------------------+---------+----------------------------------------------------------+ +| **text** | ``string`` | **MySQL** | *all* | ``TINYTEXT`` [16] | +| | | | +----------------------------------------------------------+ +| | | | | ``TEXT`` [17] | +| | | | +----------------------------------------------------------+ +| | | | | ``MEDIUMTEXT`` [18] | +| | | | +----------------------------------------------------------+ +| | | | | ``LONGTEXT`` [19] | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **PostgreSQL** | *all* | ``TEXT`` | +| | +--------------------------+ | | +| | | **Oracle** | *all* | ``CLOB`` | +| | +--------------------------+ | | +| | | **SQLite** | | | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **SQL Server** | *all* | ``VARCHAR(MAX)`` | ++-------------------+--------------------+--------------------------+---------+----------------------------------------------------------+ +| **guid** | ``string`` | **MySQL** | *all* | ``CHAR(36)`` [1] | +| | +--------------------------+ | | +| | | **Oracle** | | | +| | +--------------------------+ | | +| | | **SQLite** | | | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **SQL Server** | *all* | ``UNIQUEIDENTIFIER`` | +| | +--------------------------+ | | +| | | **PostgreSQL** | *all* | ``UUID`` | ++-------------------+--------------------+--------------------------+---------+----------------------------------------------------------+ +| **binary** | ``resource`` | **MySQL** | *all* | ``VARBINARY(n)`` [3] | +| [2] [6] | +--------------------------+ +----------------------------------------------------------+ +| | | **SQL Server** | | ``BINARY(n)`` [4] | +| | +--------------------------+ +----------------------------------------------------------+ +| | | **Oracle** | *all* | ``RAW(n)`` | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **PostgreSQL** | *all* | ``BYTEA`` [15] | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **SQLite** | *all* | ``BLOB`` [15] | ++-------------------+--------------------+--------------------------+---------+----------------------------------------------------------+ +| **blob** | ``resource`` | **MySQL** | *all* | ``TINYBLOB`` [16] | +| | | | +----------------------------------------------------------+ +| | | | | ``BLOB`` [17] | +| | | | +----------------------------------------------------------+ +| | | | | ``MEDIUMBLOB`` [18] | +| | | | +----------------------------------------------------------+ +| | | | | ``LONGBLOB`` [19] | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **Oracle** | *all* | ``BLOB`` | +| | +--------------------------+ | | +| | | **SQLite** | | | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **SQL Server** | *all* | ``VARBINARY(MAX)`` | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **PostgreSQL** | *all* | ``BYTEA`` | ++-------------------+--------------------+--------------------------+---------+----------------------------------------------------------+ +| **boolean** | ``boolean`` | **MySQL** | *all* | ``TINYINT(1)`` | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **PostgreSQL** | *all* | ``BOOLEAN`` | +| | +--------------------------+ | | +| | | **SQLite** | | | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **SQL Server** | *all* | ``BIT`` | +| | +--------------------------+ | | +| | | **Oracle** | *all* | ``NUMBER(1)`` | ++-------------------+--------------------+--------------------------+---------+----------------------------------------------------------+ +| **date** | ``\DateTime`` | **MySQL** | *all* | ``DATE`` | +| | +--------------------------+ | | +| | | **PostgreSQL** | | | +| | +--------------------------+ | | +| | | **Oracle** | | | +| | +--------------------------+ | | +| | | **SQLite** | | | +| | +--------------------------+---------+ | +| | | **SQL Server** | "all" | | ++-------------------+--------------------+--------------------------+---------+----------------------------------------------------------+ +| **datetime** | ``\DateTime`` | **MySQL** | *all* | ``DATETIME`` [13] | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **SQL Server** | *all* | ``DATETIME`` | +| | +--------------------------+ | | +| | | **SQLite** | | | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **PostgreSQL** | *all* | ``TIMESTAMP(0) WITHOUT TIME ZONE`` | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **Oracle** | *all* | ``TIMESTAMP(0)`` | ++-------------------+--------------------+--------------------------+---------+----------------------------------------------------------+ +| **datetimetz** | ``\DateTime`` | **MySQL** | *all* | ``DATETIME`` [14] [15] | +| | +--------------------------+ | | +| | | **SQLite** | | | +| | +--------------------------+---------+ | +| | | **SQL Server** | "all" | | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **PostgreSQL** | *all* | ``TIMESTAMP(0) WITH TIME ZONE`` | +| | +--------------------------+ | | +| | | **Oracle** | | | ++-------------------+--------------------+--------------------------+---------+----------------------------------------------------------+ +| **time** | ``\DateTime`` | **MySQL** | *all* | ``TIME`` | +| | +--------------------------+ | | +| | | **SQLite** | | | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **PostgreSQL** | *all* | ``TIME(0) WITHOUT TIME ZONE`` | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **Oracle** | *all* | ``DATE`` [15] | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **SQL Server** | "all" | ``TIME(0)`` | ++-------------------+--------------------+--------------------------+---------+----------------------------------------------------------+ +| **simple array** | ``array`` | **MySQL** | *all* | ``TINYTEXT`` [16] | +| [1] | | | +----------------------------------------------------------+ +| | | | | ``TEXT`` [17] | +| | | | +----------------------------------------------------------+ +| | | | | ``MEDIUMTEXT`` [18] | +| | | | +----------------------------------------------------------+ +| | | | | ``LONGTEXT`` [19] | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **PostgreSQL** | *all* | ``TEXT`` | +| | +--------------------------+ | | +| | | **Oracle** | *all* | ``CLOB`` | +| | +--------------------------+ | | +| | | **SQLite** | | | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **SQL Server** | *all* | ``VARCHAR(MAX)`` | ++-------------------+--------------------+--------------------------+---------+----------------------------------------------------------+ +| **json** | ``mixed`` | **MySQL** | *all* | ``JSON`` | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **PostgreSQL** | *all* | ``JSON`` [20] | +| | | | +----------------------------------------------------------+ +| | | | | ``JSONB`` [21] | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **Oracle** | *all* | ``CLOB`` [1] | +| | +--------------------------+ | | +| | | **SQLite** | | | +| | +--------------------------+---------+----------------------------------------------------------+ +| | | **SQL Server** | *all* | ``VARCHAR(MAX)`` [1] | ++-------------------+--------------------+--------------------------+---------+----------------------------------------------------------+ diff --git a/tests/Functional/tests/pretty-table-multiline-header/pretty-table-multiline-header.html b/tests/Functional/tests/table-grid-multiline-header/table-grid-multiline-header.html similarity index 100% rename from tests/Functional/tests/pretty-table-multiline-header/pretty-table-multiline-header.html rename to tests/Functional/tests/table-grid-multiline-header/table-grid-multiline-header.html diff --git a/tests/Functional/tests/pretty-table-multiline-header/pretty-table-multiline-header.rst b/tests/Functional/tests/table-grid-multiline-header/table-grid-multiline-header.rst similarity index 100% rename from tests/Functional/tests/pretty-table-multiline-header/pretty-table-multiline-header.rst rename to tests/Functional/tests/table-grid-multiline-header/table-grid-multiline-header.rst diff --git a/tests/Functional/tests/pretty-table-no-header/pretty-table-no-header.html b/tests/Functional/tests/table-grid-no-header/table-grid-no-header.html similarity index 100% rename from tests/Functional/tests/pretty-table-no-header/pretty-table-no-header.html rename to tests/Functional/tests/table-grid-no-header/table-grid-no-header.html diff --git a/tests/Functional/tests/pretty-table-no-header/pretty-table-no-header.rst b/tests/Functional/tests/table-grid-no-header/table-grid-no-header.rst similarity index 100% rename from tests/Functional/tests/pretty-table-no-header/pretty-table-no-header.rst rename to tests/Functional/tests/table-grid-no-header/table-grid-no-header.rst diff --git a/tests/Functional/tests/pretty-table-row-span/pretty-table-row-span.html b/tests/Functional/tests/table-grid-row-span/table-grid-row-span.html similarity index 100% rename from tests/Functional/tests/pretty-table-row-span/pretty-table-row-span.html rename to tests/Functional/tests/table-grid-row-span/table-grid-row-span.html diff --git a/tests/Functional/tests/pretty-table-row-span/pretty-table-row-span.rst b/tests/Functional/tests/table-grid-row-span/table-grid-row-span.rst similarity index 100% rename from tests/Functional/tests/pretty-table-row-span/pretty-table-row-span.rst rename to tests/Functional/tests/table-grid-row-span/table-grid-row-span.rst