PostgreSQL-For-Wordpress/postgresql-for-wordpress
1
0
Fork 1
mirror of https://github.com/PostgreSQL-For-Wordpress/postgresql-for-wordpress.git synced 2025-06-25 09:21:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #138 from PostgreSQL-For-Wordpress/hotfix/add-end-to-reserved-keywords

Browse Source 
add end to list of reserved keywords
This commit is contained in:
Matthew Bucci
2024-10-19 02:32:15 -04:00
committed by GitHub
parent 129aa7f171 1327b9d82f
commit 333f414a58
2 changed files with 62 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pg4wp/rewriters/CreateTableSQLRewriter.php
View File

@ -150,7 +150,7 @@ class CreateTableSQLRewriter extends AbstractSQLRewriter
$columnsAndKeys = $matches[3]; $columnsAndKeys = $matches[3];
$suffix = ')' . $matches[4]; $suffix = ')' . $matches[4];
$regex = '/(?:^|\s*,\s*)(\b(?:timestamp|date|time|default)\b)\s*(?=\s+\w+)/i'; $regex = '/(?:^|\s*,\s*)(\b(?:timestamp|date|time|default|end)\b)\s*(?=\s+\w+)/i';
// Callback function to add quotes around protected column names // Callback function to add quotes around protected column names
$callback = function($matches) { $callback = function($matches) {

61
tests/rewriteTest.php
View File

@ -785,6 +785,67 @@ final class rewriteTest extends TestCase
$this->assertSame(trim($expected), trim($postgresql)); $this->assertSame(trim($expected), trim($postgresql));
} }
public function test_it_quotes_reserved_columns()
{
$sql = <<<SQL
CREATE TABLE wp_aioseo_notifications (
id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
slug varchar(13) NOT NULL,
title text NOT NULL,
content longtext NOT NULL,
type varchar(64) NOT NULL,
level text NOT NULL,
notification_id bigint(20) unsigned DEFAULT NULL,
notification_name varchar(255) DEFAULT NULL,
start datetime DEFAULT NULL,
end datetime DEFAULT NULL,
button1_label varchar(255) DEFAULT NULL,
button1_action varchar(255) DEFAULT NULL,
button2_label varchar(255) DEFAULT NULL,
button2_action varchar(255) DEFAULT NULL,
dismissed tinyint(1) NOT NULL DEFAULT 0,
created datetime NOT NULL,
updated datetime NOT NULL,
PRIMARY KEY (id),
UNIQUE KEY ndx_aioseo_notifications_slug (slug),
KEY ndx_aioseo_notifications_dates (start, end),
KEY ndx_aioseo_notifications_type (type),
KEY ndx_aioseo_notifications_dismissed (dismissed)
) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_520_ci;
SQL;
$expected = <<<SQL
CREATE TABLE IF NOT EXISTS wp_aioseo_notifications (
id bigserial,
slug varchar(13) NOT NULL,
title text NOT NULL,
content text NOT NULL,
type varchar(64) NOT NULL,
level text NOT NULL,
notification_id bigint DEFAULT NULL,
notification_name varchar(255) DEFAULT NULL,
start timestamp DEFAULT NULL,
"end" timestamp DEFAULT NULL,
button1_label varchar(255) DEFAULT NULL,
button1_action varchar(255) DEFAULT NULL,
button2_label varchar(255) DEFAULT NULL,
button2_action varchar(255) DEFAULT NULL,
dismissed smallint NOT NULL DEFAULT 0,
created timestamp NOT NULL,
updated timestamp NOT NULL,
PRIMARY KEY (id)
);
CREATE UNIQUE INDEX IF NOT EXISTS wp_aioseo_notifications_ndx_aioseo_notifications_slug ON wp_aioseo_notifications (slug);
CREATE INDEX IF NOT EXISTS wp_aioseo_notifications_ndx_aioseo_notifications_dates ON wp_aioseo_notifications (start, end);
CREATE INDEX IF NOT EXISTS wp_aioseo_notifications_ndx_aioseo_notifications_type ON wp_aioseo_notifications (type);
CREATE INDEX IF NOT EXISTS wp_aioseo_notifications_ndx_aioseo_notifications_dismissed ON wp_aioseo_notifications (dismissed);
SQL;
$postgresql = pg4wp_rewrite($sql);
$this->assertSame(trim($expected), trim($postgresql));
}
protected function setUp(): void protected function setUp(): void
{ {
global $wpdb; global $wpdb;