Skip to content

Commit

Permalink
Upgrade vendored SQLite, prepare CRAN release
Browse files Browse the repository at this point in the history
  • Loading branch information
krlmlr committed Oct 27, 2023
1 parent cca1a1f commit 7637aa3
Show file tree
Hide file tree
Showing 11 changed files with 5,004 additions and 2,403 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: RSQLite
Title: SQLite Interface for R
Version: 2.3.1
Date: 2023-04-03
Version: 2.3.2
Date: 2023-10-27
Authors@R: c(
person("Kirill", "Müller", , "[email protected]", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-1416-3412")),
Expand Down
11 changes: 11 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
<!-- NEWS.md is maintained by https://fledge.cynkra.com, contributors should not edit this file -->

# RSQLite 2.3.2 (2023-10-27)

## Features

- Upgrade bundled SQLite to 3.42.0 (#461).

## Internal

- Require cpp11 \>= 0.4.0 (#456).


# RSQLite 2.3.1 (2023-04-03)

## Features
Expand Down
2 changes: 1 addition & 1 deletion R/dbConnect_SQLiteDriver.R
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#' function will be called on the new connection.Setting this value to `FALSE`
#' requires calling `initExtension()` manually.
#' @param vfs Select the SQLite3 OS interface. See
#' \url{https://www.sqlite.org/vfs.html} for details. Allowed values are
#' https://www.sqlite.org/vfs.html for details. Allowed values are
#' `"unix-posix"`, `"unix-unix-afp"`,
#' `"unix-unix-flock"`, `"unix-dotfile"`, and
#' `"unix-none"`.
Expand Down
2 changes: 1 addition & 1 deletion README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pkgload::load_all()
<!-- badges: start -->
[![Lifecycle: stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html)
[![rcc](https://github.com/r-dbi/RSQLite/workflows/rcc/badge.svg)](https://github.com/r-dbi/RSQLite/actions)
[![Coverage Status](https://codecov.io/gh/r-dbi/RSQLite/branch/master/graph/badge.svg)](https://codecov.io/github/r-dbi/RSQLite?branch=master)
[![Coverage Status](https://codecov.io/gh/r-dbi/RSQLite/branch/main/graph/badge.svg)](https://app.codecov.io/github/r-dbi/RSQLite?branch=main)
[![CRAN status](https://www.r-pkg.org/badges/version/RSQLite)](https://cran.r-project.org/package=RSQLite)
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/3234/badge)](https://bestpractices.coreinfrastructure.org/projects/3234)
<!-- badges: end -->
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<!-- badges: start -->

[![Lifecycle: stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html) [![rcc](https://github.com/r-dbi/RSQLite/workflows/rcc/badge.svg)](https://github.com/r-dbi/RSQLite/actions) [![Coverage Status](https://codecov.io/gh/r-dbi/RSQLite/branch/master/graph/badge.svg)](https://codecov.io/github/r-dbi/RSQLite?branch=master) [![CRAN status](https://www.r-pkg.org/badges/version/RSQLite)](https://cran.r-project.org/package=RSQLite) [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/3234/badge)](https://bestpractices.coreinfrastructure.org/projects/3234)
[![Lifecycle: stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html) [![rcc](https://github.com/r-dbi/RSQLite/workflows/rcc/badge.svg)](https://github.com/r-dbi/RSQLite/actions) [![Coverage Status](https://codecov.io/gh/r-dbi/RSQLite/branch/main/graph/badge.svg)](https://app.codecov.io/github/r-dbi/RSQLite?branch=main) [![CRAN status](https://www.r-pkg.org/badges/version/RSQLite)](https://cran.r-project.org/package=RSQLite) [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/3234/badge)](https://bestpractices.coreinfrastructure.org/projects/3234)

<!-- badges: end -->

Expand Down
8 changes: 3 additions & 5 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
RSQLite 2.3.1
RSQLite 2.3.2

## Current CRAN check results

- [x] Checked on 2023-04-03, problems found: https://cran.r-project.org/web/checks/check_results_RSQLite.html
- [x] WARN: r-devel-linux-x86_64-debian-gcc, r-devel-linux-x86_64-fedora-gcc, r-devel-windows-x86_64: Fixed
- [x] NOTE: r-release-macos-arm64, r-release-macos-x86_64, r-oldrel-macos-arm64, r-oldrel-macos-x86_64, r-oldrel-windows-ix86+x86_64: Large binary
- [x] gcc12: Fixed
- [x] Checked on 2023-10-27, problems found: https://cran.r-project.org/web/checks/check_results_RSQLite.html
- [x] NOTE: r-release-macos-arm64, r-release-macos-x86_64, r-oldrel-macos-arm64, r-oldrel-macos-x86_64: Large binary.
2 changes: 1 addition & 1 deletion man/SQLite.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/vendor/extensions/regexp.c
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ static const char *re_subcompile_string(ReCompiled *p){
break;
}
case '[': {
int iFirst = p->nState;
unsigned int iFirst = p->nState;
if( rePeek(p)=='^' ){
re_append(p, RE_OP_CC_EXC, 0);
p->sIn.i++;
Expand All @@ -619,7 +619,7 @@ static const char *re_subcompile_string(ReCompiled *p){
if( rePeek(p)==']' ){ p->sIn.i++; break; }
}
if( c==0 ) return "unclosed '['";
p->aArg[iFirst] = p->nState - iFirst;
if( p->nState>iFirst ) p->aArg[iFirst] = p->nState - iFirst;
break;
}
case '\\': {
Expand Down
Loading

0 comments on commit 7637aa3

Please sign in to comment.