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

update cr-sqlite to v0.16.2 #488

Merged
merged 2 commits into from
Dec 15, 2023
Merged

Conversation

tantaman
Copy link
Contributor

@tantaman tantaman commented Oct 20, 2023

This updates to match vlcn-io/cr-sqlite#399

I've conditional compilation based on whether or not we're in libsql keeping libsql up to date can be full automated. It previously required me doing a bunch of manual work and was slowing everything down to get changes over to the libsql side.

@tantaman tantaman mentioned this pull request Oct 20, 2023
2 tasks
warmchang pushed a commit to warmchang/libsql-SQLite that referenced this pull request Oct 21, 2023
@tantaman tantaman marked this pull request as ready for review October 26, 2023 18:00
@tantaman tantaman changed the title update cr-sqlite to head update cr-sqlite to head of https://github.com/vlcn-io/cr-sqlite Oct 26, 2023
@tantaman tantaman changed the title update cr-sqlite to head of https://github.com/vlcn-io/cr-sqlite update cr-sqlite to head Oct 26, 2023
@tantaman tantaman marked this pull request as draft October 31, 2023 15:26
@tantaman tantaman force-pushed the update-libsql branch 3 times, most recently from 680d1ce to 06a7207 Compare November 10, 2023 13:43
@tantaman tantaman marked this pull request as ready for review November 10, 2023 13:47
@tantaman tantaman changed the title update cr-sqlite to head update cr-sqlite to https://github.com/vlcn-io/cr-sqlite/pull/399 Nov 10, 2023
@tantaman tantaman mentioned this pull request Nov 21, 2023
3 tasks
@penberg
Copy link
Collaborator

penberg commented Dec 12, 2023

@psarna can we merge this?

@psarna
Copy link
Collaborator

psarna commented Dec 12, 2023

@penberg as soon as conflicts are resolved - yeah

@tantaman tantaman changed the title update cr-sqlite to https://github.com/vlcn-io/cr-sqlite/pull/399 update cr-sqlite to v0.16.2 Dec 12, 2023
@tantaman
Copy link
Contributor Author

tantaman commented Dec 12, 2023

Conflicts should be resolved.

I'm going to follow this up with a PR that adds cr-sqlite tests and build to CI so you all can start grabbing the correct version for inclusion in Turso builds. The one you currently grab does not include the close_hook and other libsql specific updates.

@tantaman
Copy link
Contributor Author

Can we go ahead an merge this? I meant I'd follow up with a separate PR to add cr-sqlite to CI since it'd be easier to review separately.

@psarna psarna added this pull request to the merge queue Dec 15, 2023
Merged via the queue into tursodatabase:main with commit e21cefe Dec 15, 2023
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants