Skip to content

fix(validations): avoid ENGINE != InnoDB false positives on row data #2873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WRasada wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

fix(validations): avoid ENGINE != InnoDB false positives on row data #2873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions __fixtures__/validations/bad-sql-dump.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,6 @@ ALTER TABLE wp_options
ADD KEY `autoload` (`autoload`);

SET UNIQUE_CHECKS = 0;

INSERT INTO wp_posts (ID, post_content) VALUES (1, 'Try our search engine = the best! ENGINE=MyISAM');
,(2, 'mydumper continuation row with ENGINE = SPAM content')
6 changes: 6 additions & 0 deletions __tests__/lib/validations/sql.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,12 @@ describe( 'lib/validations/sql', () => {
it( 'instances of ENGINE != InnoDB', () => {
expect( output ).toContain( 'ENGINE != InnoDB on line(s) 14' );
} );
it( 'no ENGINE != InnoDB false positives on row data containing "engine =" strings', () => {
// Lines 43-44 are an INSERT statement and a mydumper-style `,(...)` VALUES row
// whose *content* mentions non-InnoDB engines; they must not be flagged. The
// trailing period asserts line 14 is the *only* flagged line.
expect( output ).toContain( 'ENGINE != InnoDB on line(s) 14.' );
} );
it( 'use statement should be ok', () => {
expect( output ).not.toContain(
"'USE <DATABASE_NAME>' should not be present (case-insensitive)"
Expand Down
5 changes: 4 additions & 1 deletion src/lib/validations/sql.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,10 @@ const checks: Checks = {
recommendation: "Use search-replace to change environment's domain",
},
engineInnoDB: {
matcher: /\sENGINE\s?=(?!(\s?InnoDB))/i,
// Skip lines holding row data (`INSERT ...`/`REPLACE ...` statements and `(...)` /
// `,(...)` VALUES rows): user content routinely contains "engine =" strings, which
// produced false positives on large dumps. ENGINE clauses only matter in DDL.
matcher: /^(?!\s*(?:INSERT|REPLACE)\b|\s*[(,]).*\sENGINE\s?=(?!(\s?InnoDB))/i,
matchHandler: lineNumber => ( { lineNumber } ),
outputFormatter: lineNumberCheckFormatter,
results: [],
Expand Down
Loading