Skip to content
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.

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

CRM: 3404 - address syntax differences between SQLite and MySQL #34869

Merged

Conversation

tbradsha
Copy link
Contributor

@tbradsha tbradsha commented Jan 5, 2024

Resolves Automattic/zero-bs-crm#3404 - address syntax differences between SQLite and MySQL

Proposed changes:

Transaction queries were outright failing when using SQLite. The underlying causes:

  1. We use transaction as a table alias in some of our queries. This is a reserved keyword in both MySQL and SQLite, but apparently SQLite is more strict. This PR changes the table alias to transactions.
  2. MySQL and SQLite have slightly different syntax for GROUP_CONCAT(). I logged the issue here, and in the meantime created build_group_concat() to build the proper string depending on the database engine.

Other information:

  • Have you written new tests for your changes, if applicable?
  • Have you checked the E2E test CI results, and verified that your changes do not break them?
  • Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

Does this pull request change what data or activity we track or use?

Testing instructions:

The most painless way to do this is to set up SQLite via the SQLite Database Integration plugin. Install that on a WordPress site, initialise the site, and then you should be good to go.

In trunk, the dashboard shows a null count, the transaction list shows no transactions even if you create one, and creating/viewing a transaction shows an error (see issue for screenshots).

In the fix/crm/3404-sqlite_transactions branch, the dashboard shows the correct count, the transaction list shows transactions, and one can create/view transactions.

@tbradsha tbradsha added [Status] Needs Team Review [Plugin] CRM Issues about the Jetpack CRM plugin labels Jan 5, 2024
@tbradsha tbradsha added this to the crm/6.3.3 milestone Jan 5, 2024
@tbradsha tbradsha requested a review from a team January 5, 2024 20:24
@tbradsha tbradsha self-assigned this Jan 5, 2024
Copy link
Contributor

github-actions bot commented Jan 5, 2024

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

  • ✅ Include a description of your PR changes.
  • ✅ Add a "[Status]" label (In Progress, Needs Team Review, ...).
  • ✅ Add testing instructions.
  • ✅ Specify whether this PR includes any changes to data or privacy.
  • ✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖


The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.


Once your PR is ready for review, check one last time that all required checks appearing at the bottom of this PR are passing or skipped.
Then, add the "[Status] Needs Team Review" label and ask someone from your team review the code. Once reviewed, it can then be merged.
If you need an extra review from someone familiar with the codebase, you can update the labels from "[Status] Needs Team Review" to "[Status] Needs Review", and in that case Jetpack Approvers will do a final review of your PR.

@tbradsha tbradsha force-pushed the fix/crm/3408-detect_sqlite_usage branch from 952d33f to ca752b6 Compare January 5, 2024 20:53
@tbradsha tbradsha force-pushed the fix/crm/3404-sqlite_transactions branch from 3325f97 to 27cc250 Compare January 5, 2024 20:54
Copy link
Contributor

@coder-karen coder-karen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests well for me.

@tbradsha tbradsha merged commit 8509d8b into fix/crm/3408-detect_sqlite_usage Jan 8, 2024
47 checks passed
@tbradsha tbradsha deleted the fix/crm/3404-sqlite_transactions branch January 8, 2024 16:05
tbradsha added a commit that referenced this pull request Jan 8, 2024
* Add database engine check

* Add changelog

* CRM: 3406 - address SQLite table creation error (#34872)

* Remove obsolete database table

* Bypass InnoDB check for SQLite

* Add changelog

* CRM: 3404 - address syntax differences between SQLite and MySQL (#34869)

* Update table alias

The `transaction` alias is a reserved keyword in SQLite.

* Implement engine-agnostic build_group_concat()

* Add changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Plugin] CRM Issues about the Jetpack CRM plugin
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants