From 28fb016969ccca1473319133c1579545f968614c Mon Sep 17 00:00:00 2001 From: Matthew Bucci Date: Tue, 27 Feb 2024 00:58:58 -0800 Subject: [PATCH] update expected results for create table tests with protected names --- pg4wp/rewriters/AlterTableSQLRewriter.php | 2 +- pg4wp/rewriters/CreateTableSQLRewriter.php | 2 +- tests/rewriteTest.php | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pg4wp/rewriters/AlterTableSQLRewriter.php b/pg4wp/rewriters/AlterTableSQLRewriter.php index 27a0c95..ac3d639 100644 --- a/pg4wp/rewriters/AlterTableSQLRewriter.php +++ b/pg4wp/rewriters/AlterTableSQLRewriter.php @@ -281,7 +281,7 @@ class AlterTableSQLRewriter extends AbstractSQLRewriter }; // Replace protected column names with quoted versions within columns and keys part - $columnsAndKeys = preg_replace_callback($regex, $callback, $columnsAndKeys, 1); + $columnsAndKeys = preg_replace_callback($regex, $callback, $columnsAndKeys); return $prefix . $columnsAndKeys . $suffix; } diff --git a/pg4wp/rewriters/CreateTableSQLRewriter.php b/pg4wp/rewriters/CreateTableSQLRewriter.php index eb4be6e..948c9ce 100644 --- a/pg4wp/rewriters/CreateTableSQLRewriter.php +++ b/pg4wp/rewriters/CreateTableSQLRewriter.php @@ -152,7 +152,7 @@ class CreateTableSQLRewriter extends AbstractSQLRewriter }; // Replace protected column names with quoted versions within columns and keys part - $columnsAndKeys = preg_replace_callback($regex, $callback, $columnsAndKeys, 1); + $columnsAndKeys = preg_replace_callback($regex, $callback, $columnsAndKeys); return $prefix . $columnsAndKeys . $suffix; } diff --git a/tests/rewriteTest.php b/tests/rewriteTest.php index b2de577..d9172f2 100644 --- a/tests/rewriteTest.php +++ b/tests/rewriteTest.php @@ -114,7 +114,7 @@ final class rewriteTest extends TestCase CREATE TABLE IF NOT EXISTS wp_itsec_dashboard_lockouts ( id serial, ip varchar(40), - time timestamp NOT NULL, + "time" timestamp NOT NULL, count int NOT NULL, PRIMARY KEY (id) ); @@ -184,7 +184,7 @@ final class rewriteTest extends TestCase CREATE TABLE IF NOT EXISTS wp_itsec_dashboard_lockouts ( id serial, ip varchar(40), - time timestamp NOT NULL, + "time" timestamp NOT NULL, count int NOT NULL, PRIMARY KEY (id) ); @@ -222,8 +222,8 @@ final class rewriteTest extends TestCase "ID" bigserial, ip varchar(60) NOT NULL, created int, - timestamp int NOT NULL, - date timestamp NOT NULL, + "timestamp" int NOT NULL, + "date" timestamp NOT NULL, referred text NOT NULL, agent varchar(255) NOT NULL, platform varchar(255), @@ -264,7 +264,7 @@ final class rewriteTest extends TestCase page_id bigserial, uri varchar(190) NOT NULL, type varchar(180) NOT NULL, - date date NOT NULL, + "date" date NOT NULL, count int NOT NULL, id int NOT NULL, PRIMARY KEY (page_id)