1
0
Fork 0
mirror of https://github.com/DBD-SQLite/DBD-SQLite synced 2025-06-07 14:19:10 -04:00

Compare commits

...

132 commits

Author SHA1 Message Date
Kenichi Ishigaki
60515b30f8 Release 1.76 2024-10-19 13:46:02 +09:00
Kenichi Ishigaki
6f99c8ce41 Release 1.75_01 2024-09-17 23:04:35 +09:00
Kenichi Ishigaki
db7ea91d83 Bump bundled SQLite to 3.46.1 2024-09-17 22:54:53 +09:00
Kenichi Ishigaki
4ac600434f
Merge pull request #115 from sisyphus/win32_quadmath
Fix for Windows quadmath builds.
2024-09-17 22:50:16 +09:00
Kenichi Ishigaki
41957ce749
Merge pull request #116 from DBD-SQLite/use_checkout_v4
Use checkout v4
2024-09-17 22:48:10 +09:00
Kenichi Ishigaki
29167a0d65 Use buster images for older perls 2024-09-17 22:43:35 +09:00
Kenichi Ishigaki
fb80b73a8a Use checkout@v4 2024-09-17 22:37:20 +09:00
sisyphus
c5374438f4 dbdimp.c - Fix for Windows quadmath builds. 2024-09-17 22:03:29 +10:00
Kenichi Ishigaki
2ab93a4e41 Update constants 2024-03-17 22:32:36 +09:00
Kenichi Ishigaki
3e8df90227 Bump bundled SQLite to 3.45.2 2024-03-17 22:32:19 +09:00
Kenichi Ishigaki
b433d17436 Update SQLiteUtil 2024-03-17 22:31:23 +09:00
Kenichi Ishigaki
9014dd6f35
Merge pull request #112 from DBD-SQLite/fix/omit_load_extension_if_static
Omit load_extension if static perl
2024-03-17 22:18:46 +09:00
Kenichi Ishigaki
922c82b0ea Omit load_extension if static perl 2024-03-17 22:08:52 +09:00
Kenichi Ishigaki
01615f8630 Bump SQLite to 3.44.0 2023-11-03 15:08:24 +09:00
Kenichi Ishigaki
fea0e3268f Release 1.74 2023-09-20 02:24:48 +09:00
Kenichi Ishigaki
d4bb44460f Release 1.73_01 2023-07-09 10:03:24 +09:00
Kenichi Ishigaki
f9e3cb6b75 Update constants 2023-07-09 10:02:25 +09:00
Kenichi Ishigaki
3f66a57dd4 Update SQLiteUtil 2023-07-09 10:02:11 +09:00
Kenichi Ishigaki
7e63e18472 Bump sqlite3 from 3.41.0 to 3.42.0 2023-07-09 09:57:07 +09:00
Kenichi Ishigaki
c08f3400e8 Add a new constant 2023-02-23 11:20:23 +09:00
Kenichi Ishigaki
f764a74395 Upgrade SQLite to 3.41.0 2023-02-23 11:19:58 +09:00
Kenichi Ishigaki
ad5125d99d Ignore newly-added prepared_statement_scan_status constants 2023-02-23 11:19:14 +09:00
Kenichi Ishigaki
dd62355f48 Add year 2023 condition 2023-02-23 11:18:55 +09:00
Kenichi Ishigaki
0dc561d920
Merge pull request #105 from dboehmer/patch-1
Add missing possible table_type values to POD
2022-11-13 03:06:42 +09:00
Daniel Böhmer
1f413acd88 Add missing possible table_type values to POD
I noticed that table_info() returns table_types that are not listed in POD.
This copies every possible value from the SQLite documentation.
'LOCAL TEMPORARY' and 'SYSTEM TABLE' are not mentioned there
but come from SQLite.pm.

SQLite documentation on possible values:
https://www.sqlite.org/schematab.html#interpretation_of_the_schema_table
2022-11-12 18:42:30 +01:00
Kenichi Ishigaki
38e116df3f Release 1.72 2022-11-04 01:27:49 +09:00
Kenichi Ishigaki
a7e5af7397 Release 1.71_07 2022-10-26 03:35:56 +09:00
Kenichi Ishigaki
bacb65a77e Upgrade SQLite to 3.39.4 2022-10-26 03:33:21 +09:00
Kenichi Ishigaki
353f185cc5 Release 1.71_06 2022-03-12 11:51:36 +09:00
Kenichi Ishigaki
b03fd9980e
Merge pull request #99 from DBD-SQLite/set_utf8cache
Set UTF8CACHE to avoid slowdown with -DDEBUGGING
2022-03-12 11:49:24 +09:00
Kenichi Ishigaki
9c6cbfcc51 Set UTF8CACHE to avoid slowdown with -DDEBUGGING 2022-03-12 10:43:05 +09:00
Kenichi Ishigaki
fc64c4688a Release 1.71_05 2022-02-26 11:38:46 +09:00
Kenichi Ishigaki
687290909c
Merge pull request #97 from DBD-SQLite/lowercase_datatype
Lowercase datatype
2022-02-26 11:33:51 +09:00
Kenichi Ishigaki
b6a4eb43a7 THX 2022-02-26 11:28:39 +09:00
Kenichi Ishigaki
abc241d711 Lowercase datatype 2022-02-26 11:20:41 +09:00
Kenichi Ishigaki
2d595f3bf2 Tidy 2022-02-26 11:19:26 +09:00
Kenichi Ishigaki
27dfab4fb2 Revert "Tidy"
This reverts commit 4a4f5d599b.
2022-02-26 11:14:13 +09:00
Kenichi Ishigaki
4a4f5d599b Tidy 2022-02-26 11:08:36 +09:00
Kenichi Ishigaki
1a3baef06d xFunc must also be NULL to delete a function 2022-02-26 11:05:54 +09:00
Kenichi Ishigaki
0edf878de0 Release 1.71_04 2022-02-26 09:57:40 +09:00
Kenichi Ishigaki
b7f24e3e1d Pass PL_sv_undef instead of NULL 2022-02-26 09:56:10 +09:00
Kenichi Ishigaki
b7c98ea81b Release 1.71_03 2022-02-23 19:45:30 +09:00
Kenichi Ishigaki
d4aea379d4 Add sqlite_error_offset 2022-02-23 19:43:21 +09:00
Kenichi Ishigaki
6d0744549a Update SQLite to 3.38.0 2022-02-23 19:37:15 +09:00
Kenichi Ishigaki
01077fa8a3 Release 1.71_02 2022-01-07 05:50:25 +09:00
Kenichi Ishigaki
30a08cebd1 Update SQLite to 3.37.2 2022-01-07 05:48:22 +09:00
Kenichi Ishigaki
1bfcf7c38e Add 2022 to SQLiteUtil::year 2022-01-07 05:48:02 +09:00
Kenichi Ishigaki
4266881e66 Update Changes 2021-12-15 06:55:08 +09:00
Kenichi Ishigaki
f278c800b3
Merge pull request #94 from d-lamb/patch-1
Clarify which method to use when loading extension
2021-12-15 06:49:28 +09:00
Derek Lamb
5fde7cf0d1
Clarify which method to use when loading extension
Loading an extension using "select" statements does not work if the extension provides new functions.  But the extension given as an example in sqlite_enable_load_extension, libsqlitefunctions.so, does define functions, so loading that particular (very commonly used) extension with a "select" statement will not work.  I changed the example in sqlite_enable_load_extension to an extension that does not provide new functions, clarified the description of sqlite_load_extension, and added the libsqlitefunctions.so example to the description of sqlite_load_extension.
2021-12-14 14:30:50 -07:00
Kenichi Ishigaki
d465ea9219 Release 1.71_01 2021-12-02 02:00:43 +09:00
Kenichi Ishigaki
3b75eb3796 Hide SESSION_OBJCONFIG_SIZE 2021-12-02 01:39:35 +09:00
Kenichi Ishigaki
8bf916dbd7 Let create_function unregister an existing function 2021-12-02 01:32:01 +09:00
Kenichi Ishigaki
7848525aeb Update constants 2021-12-02 01:28:49 +09:00
Kenichi Ishigaki
ba4f472e73 Tweak for 3.37.0 2021-12-02 01:25:48 +09:00
Kenichi Ishigaki
d83bd84606 Update SQLite to 3.37.0 2021-12-02 01:25:24 +09:00
Kenichi Ishigaki
951617af45 Update Changes 2021-08-03 21:51:50 +09:00
Kenichi Ishigaki
428148d2cd
Merge pull request #90 from HaraldJoerg/utf_pod
Fix accented characters in SQLite.pm's POD
2021-08-03 21:50:14 +09:00
Harald Jörg
b4a573259f Fix accented characters in SQLite.pm's POD 2021-08-03 13:55:13 +02:00
Kenichi Ishigaki
711f90b8c7
Merge pull request #89 from FGasper/fix_sqlite_unicode_pod
Remove mention of now-deprecated “sqlite_unicode” parameter.
2021-08-03 10:40:08 +09:00
Felipe Gasper
ab0022890a Remove mention of now-deprecated “sqlite_unicode” parameter. 2021-08-02 20:49:33 -04:00
Kenichi Ishigaki
87e1545ccb Release 1.70 2021-08-01 19:20:26 +09:00
Kenichi Ishigaki
631cc94f17 Release 1.69_02 2021-07-30 23:18:42 +09:00
Kenichi Ishigaki
f949de6ab6 Fix an encoding issue of naive 2021-07-30 23:17:55 +09:00
Kenichi Ishigaki
0a455850e8 Fix doc that uses string_mode without the sqlite_ prefix (#86) 2021-07-30 23:12:04 +09:00
Kenichi Ishigaki
43225fd7eb No need to check unicode twice 2021-07-30 23:09:47 +09:00
Kenichi Ishigaki
6bac0136b3 Release 1.69_01 2021-07-30 06:07:43 +09:00
Kenichi Ishigaki
6e7986e8d4 Silence the deprecation warning of sqlite_unicode as it's so widely used 2021-07-30 06:05:13 +09:00
Kenichi Ishigaki
0f476b9904 Fix typo (#85) 2021-07-26 11:43:57 +09:00
Kenichi Ishigaki
d2abfe2752 Release 1.68 2021-07-22 14:28:47 +09:00
Kenichi Ishigaki
95a360a6a4 Release 1.67_07 2021-06-19 09:56:55 +09:00
Kenichi Ishigaki
f587238ff3 Update SQLite to 3.36.0 2021-06-19 09:49:56 +09:00
Kenichi Ishigaki
a7e04d785c Release 1.67_06 2021-06-14 12:48:15 +09:00
Kenichi Ishigaki
1aaf18dbf7 Experiment with quadmath patch from Tux to see if it works with older version of FreeBSD 2021-06-14 12:46:37 +09:00
Kenichi Ishigaki
076a7fd814 Release 1.67_05 2021-06-13 08:38:29 +09:00
Kenichi Ishigaki
fd0ecce1b0 Tweak doc 2021-06-06 01:56:56 +09:00
Kenichi Ishigaki
f14744d31a Use imported constants 2021-06-06 01:53:52 +09:00
Kenichi Ishigaki
9e59c780a7 Update Changes 2021-05-31 08:33:58 +09:00
Kenichi Ishigaki
dddc12423a Make DBD_SQLITE_STRING_MODE_ constants exportable 2021-05-31 08:31:22 +09:00
Kenichi Ishigaki
5c7779f889 Release 1.67_04 2021-05-31 07:53:52 +09:00
Kenichi Ishigaki
791eaba2ac Fix a leak 2021-05-30 22:41:48 +09:00
Kenichi Ishigaki
77f897da5a For ASAN testing 2021-05-30 22:41:37 +09:00
Kenichi Ishigaki
20782166cf Tweak constants.pl 2021-05-30 21:25:28 +09:00
Kenichi Ishigaki
0557f8d315 Update SQLite to 3.35.5 2021-05-30 21:24:14 +09:00
Kenichi Ishigaki
1dc2e1dbe2 Fix to use string_mode 2021-05-30 21:19:18 +09:00
Kenichi Ishigaki
31483a245f Merge branch 'string_mode' 2021-05-30 21:18:42 +09:00
Kenichi Ishigaki
57d2dd7fb5
Merge pull request #76 from DBD-SQLite/#75_fix_fts3_offsets
#75 fix fts3 offsets
2021-05-30 20:44:46 +09:00
Felipe Gasper
9dc75eaead Replace “string_unicode” boolean with “string_mode” enum.
Issue #78 and issue #68: This introduces additional, more robust
schemas for translating strings between SQLite and Perl.
2021-05-29 19:19:58 -04:00
dami
a512146d47 fix #74 -- add a dependency from dbdimp.o to the *.inc files included into dbdimp.c 2021-05-13 19:35:52 +02:00
dami
6669dbc332 cleanup tokenizer code and test 2021-05-13 12:27:57 +02:00
dami
80c7c91ae6 better variable names and comments 2021-05-11 09:40:24 +02:00
dami
f68f79415f test to show that perl tokenizer with unicode is extremely slow 2021-05-11 09:01:59 +02:00
dami
8d5a28cf5c additional test for snippet() 2021-05-09 22:22:39 +02:00
dami
b5c3f9d528 fixed #75 -- lastCharOffset must copy the OLD value of piEndOffset, BEFORE it is recomputed
also fixed 43_fts3.t so that it uses \p{Word} instead of \w, because en-us locale did not handle accented characters
2021-05-09 22:06:28 +02:00
dami
be9f64b2c9 tests for functions snippet() and offets() 2021-05-09 19:25:27 +02:00
Kenichi Ishigaki
aa90eee3a0
Merge pull request #67 from FGasper/fix_svpv_downgrade
Give upgraded strings to SQLite as downgraded when sqlite_unicode==0.
2021-04-25 22:30:53 +09:00
Kenichi Ishigaki
6c4d96adfe Typo 2021-04-18 08:46:11 +09:00
Kenichi Ishigaki
f066bb49ad
Merge pull request #72 from pullhub/sqlite_load_extension-vs-threadsafe
Note conflict between SQLITE_THREADSAFE default and extensions in POD
2021-04-17 22:48:33 +09:00
Bjoern Hoehrmann
0c6d966f1c Note conflict between SQLITE_THREADSAFE default and extensions that need sqlite3_mutex_* functions 2021-04-17 14:13:48 +02:00
Kenichi Ishigaki
768d3a99d2 Update Changes 2021-04-17 18:53:28 +09:00
Kenichi Ishigaki
2cd3f0cb20
Merge pull request #71 from DBD-SQLite/check_pthreads
Check pthreads
2021-04-17 18:49:26 +09:00
Kenichi Ishigaki
cedc9d4657 Test with a few more perls 2021-04-17 18:38:00 +09:00
Kenichi Ishigaki
8861380590 Set THREADSAFE=0 only if usethreads is undef and pthreads is not linked 2021-04-17 18:37:44 +09:00
Kenichi Ishigaki
797b724b43 Revert "Do not force THREADSAFE=0 when perl does not have usethreads (fix #69)"
This reverts commit b56f872c82.
2021-04-17 18:30:10 +09:00
Kenichi Ishigaki
b56f872c82 Do not force THREADSAFE=0 when perl does not have usethreads (fix #69) 2021-04-17 14:24:16 +09:00
Kenichi Ishigaki
020bc9062f Update SQLite to 3.35.4 2021-04-17 14:04:50 +09:00
Felipe Gasper
f1342ec177 Give upgraded strings to SQLite as downgraded when sqlite_unicode==0.
Issue #66: If $a and $b contain the same code points but one is upgraded
and the other isn’t, previously DBD::SQLite would give two different C
strings to SQLite. This changeset fixes that so that SQLite always
translates equivalent Perl strings to the same C string, regardless of the
Perl strings’ internal encoding.
2021-03-31 20:33:57 -04:00
Kenichi Ishigaki
e455116b51 Release 1.67_03 2021-03-31 06:35:06 +09:00
Kenichi Ishigaki
b045ba29b8 Use NVff (Tux++, leont++) #65 2021-03-31 06:30:45 +09:00
Kenichi Ishigaki
7fcca420ba Apply a patch for t/rt_73787_exponential_buffer_overflow.t (Tux++) #64 2021-03-31 06:23:36 +09:00
Kenichi Ishigaki
7bfec13b7e Enable math functions introduced in SQLite 3.35.0 2021-03-31 06:22:27 +09:00
Kenichi Ishigaki
4a81dcf4c7 Upgrade SQLite to 3.35.3 2021-03-31 06:22:09 +09:00
Kenichi Ishigaki
c15f5c5d4f Support versions released in 2021 2021-03-31 06:21:40 +09:00
Kenichi Ishigaki
3dff252633 Use https 2021-03-31 06:21:08 +09:00
Kenichi Ishigaki
242d674a55 Release 1.67_02 2020-12-06 02:04:08 +09:00
Kenichi Ishigaki
2db48b8ca1 Update Changes 2020-12-06 02:01:55 +09:00
Kenichi Ishigaki
4d1b28c393 Expose sqlite3_txn_state 2020-12-06 02:00:27 +09:00
Kenichi Ishigaki
fa6fa30878 Add a few constants 2020-12-06 01:59:56 +09:00
Kenichi Ishigaki
09278cad8e Updated SQLite to 3.34.0 2020-12-05 18:19:38 +09:00
Kenichi Ishigaki
e51324a7a3 Release 1.67_01 2020-11-24 21:57:43 +09:00
Kenichi Ishigaki
9eb89925a8 Add reporter's id 2020-11-24 21:53:18 +09:00
Kenichi Ishigaki
dd6ab32da9 Use av_fetch instead of av_shift, to avoid leaks 2020-11-23 21:41:57 +09:00
Kenichi Ishigaki
c5cce9f54f Strawberry perl seems to be installed already 2020-11-23 21:25:54 +09:00
Kenichi Ishigaki
d380158688 Use quadmath_snprintf if USE_QUADMATH is defined 2020-11-23 21:16:26 +09:00
Kenichi Ishigaki
7c01d15368 Update Changes 2020-11-06 06:16:07 +09:00
Kenichi Ishigaki
bd949a1c5d
Merge pull request #63 from toddr/foo
Switch to XSLoader
2020-11-06 06:14:28 +09:00
Todd Rinaldo
077ce52491 Switch to XSLoader 2020-11-05 10:54:42 -06:00
Kenichi Ishigaki
f6f75fa325 Update SQLite to 3.33.0 2020-08-30 11:16:42 +09:00
Kenichi Ishigaki
108b4a9b54 Release 1.66 2020-08-30 11:12:12 +09:00
Kenichi Ishigaki
3e91167b0c Release 1.65_03 2020-07-27 01:41:36 +09:00
Kenichi Ishigaki
4d7d00544e Update constants 2020-07-27 01:36:35 +09:00
Kenichi Ishigaki
9159838d96 Updated SQLite to 3.32.3 2020-07-27 01:36:01 +09:00
36 changed files with 61795 additions and 30056 deletions

View file

@ -15,14 +15,18 @@ jobs:
strategy:
matrix:
perl-version:
- '5.8'
- '5.8-buster'
- '5.10-buster'
- '5.18-buster'
- '5.20-buster'
- '5.26'
- 'latest'
container:
image: perl:${{ matrix.perl-version }}
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: perl -V
run: perl -V
- name: Install dependencies

View file

@ -14,10 +14,10 @@ jobs:
steps:
- uses: actions/checkout@master
- name: Set up Perl
run: |
choco install strawberryperl
echo "##[add-path]C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin"
# - name: Set up Perl
# run: |
# choco install strawberryperl
# echo "##[add-path]C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin"
- name: perl -V
run: perl -V
- name: Install dependencies with develop

104
Changes
View file

@ -1,5 +1,109 @@
Changes for Perl extension DBD-SQLite
1.76 2024-10-19
- Switched to a production version
1.75_01 2024-09-17
- Upgraded SQLite to 3.46.1
- Fix for Windows quadmath builds (GH#115, sisyphus++)
- Omit load_extension if static build
1.74 2023-09-20
- Switched to a production version
1.73_01 2023-07-09
- Upgraded SQLite to 3.42.0
- Add missing possible table_type values to POD (GH#105, dboehmer++)
1.72 2022-11-04
- Switched to a production version
1.71_07 2022-10-26
- Upgraded SQLite to 3.39.4
1.71_06 2022-03-12
- Set UTF8CACHE to avoid slowdown with -DDEBUGGING (andk, Leont, FGasper)
1.71_05 2022-02-26
- Fix another test failure on perl built with -DDEBUGGING
- Lowercase datatype in table column metadata for backcompat
1.71_04 2022-02-26
- Fix test failure on perl built with -DDEBUGGING (andk++)
1.71_03 2022-02-23
- Upgraded SQLite to 3.38.0
- Expose sqlite_error_offset introduced in 3.38.0
1.71_02 2022-01-07
- Upgraded SQLite to 3.37.2
- Improve sqlite_load_extension doc (GH#94, Derek Lamb++)
1.71_01 2021-12-02
- Upgraded SQLite to 3.37.0
- Add a feature to unregister a created function
- Fix accented characters in POD (GH#90, HaraldJoerg++)
1.70 2021-08-01
- Switched to a production version
1.69_02 2021-07-30
- Fix doc to use the correct attribute with sqlite_ (GH#86, eekboek++)
- Modify the fix to silence the sqlite_unicode warning not to check
the attribute twice
- Fix an encoding issue of naive (GH#83, HaraldJoerg++)
1.69_01 2021-07-30
- Typo (GH#85, grr++)
- Silenced deprecation warning of sqlite_unicode not to break
tests of existing applications
1.68 2021-07-22
- Switched to a production version
1.67_07 2021-06-19
- Upgraded SQLite to 3.36.0
1.67_06 2021-06-14
- Experiment with another quadmath patch to see if it works
with an older version of FreeBSD
1.67_05 2021-06-13
- Made DBD_SQLITE_STRING_MODE constants exportable
1.67_04 2021-05-31
- Upgraded SQLite to 3.35.5
- Stop setting THREADSAFE=0 if perl has pthread (ie. 5.20+)
(Bjoern Hoehrmann++, GH#69, #72)
- Fixed a memory leak in ::VirtualTable
- Introduced "string_mode" handle attribute (Felipe Gasper++)
to fix long-standing issues of sqlite_unicode (GH#78, #68)
- Added a dependency from dbdimp.o to the *.inc files included
into dbdimp.c (Laurent Dami++, GH#74)
- Fixed an offset issue of VirtualTable (Laurent Dami++, GH#75)
1.67_03 2021-03-31
- Upgraded SQLite to 3.35.3
- Enabled math functions introduced in SQLite 3.35
- Fix quadmath issues (Tux++, leont++)
1.67_02 2020-12-06
- Upgraded SQLite to 3.34.0
- Added a few new constants
- Added sqlite_txn_state method to see internal state
of the backend
1.67_01 2020-11-24
- Switched to XSLoader (GH#63; toddr++)
- Use quadmath_snprintf if USE_QUADMATH is defined
- Use av_fetch instead of av_shift (norimy++)
1.66 2020-08-30
- Switched to a production version
1.65_03 2020-07-27
- Upgraded SQLite to 3.32.3
1.65_02 2020-02-08
- Upgraded SQLite to 3.31.1

View file

@ -236,6 +236,7 @@ my @CC_DEFINE = (
# '-DSQLITE_ENABLE_STAT4', # for sqlite >= 3.8.3.1
'-DSQLITE_ENABLE_JSON1', # for sqlite >= 3.9.0
'-DSQLITE_ENABLE_FTS5', # for sqlite >= 3.9.0
'-DSQLITE_ENABLE_MATH_FUNCTIONS', # for sqlite >= 3.35.0
'-DNDEBUG=1',
);
@ -261,7 +262,7 @@ if ( $^O eq 'cygwin') {
if ( $Config{d_usleep} || $Config{osname} =~ m/linux/ ) {
push @CC_DEFINE, '-DHAVE_USLEEP=1';
}
unless ( $Config{usethreads} ) {
if ( !$Config{usethreads} and $Config{libs} !~ /pthread/ ) {
push @CC_DEFINE, '-DTHREADSAFE=0';
}
if ($^O eq 'hpux' and $Config{osvers} <= 10.20) {
@ -287,8 +288,18 @@ if ($^O =~ /bsd/i && $^O !~ /(?:open|net)bsd/) {
push @CC_DEFINE, '-D_XOPEN_SOURCE';
}
if (!$Config{usedl}) {
push @CC_DEFINE, '-DSQLITE_OMIT_LOAD_EXTENSION';
}
my (@CCFLAGS, @LDFLAGS, @LDDLFLAGS);
if ($ENV{TEST_DBD_SQLITE_WITH_ASAN}) {
push @CCFLAGS, '-fsanitize=address -static-libasan -fuse-ld=gold -fno-omit-frame-pointer -g -O2';
push @LDFLAGS, '-fsanitize=address -static-libasan -fuse-ld=gold -fno-omit-frame-pointer -g -O2';
push @LDDLFLAGS, '-fsanitize=address -static-libasan -fuse-ld=gold -fno-omit-frame-pointer -g -O2';
}
# RT #70135: See if ld supports Bsymbolic;
unless ($^O eq 'MSWin32' && $Config{ld} =~ /link/) {
for my $path (File::Spec->path) {
@ -393,6 +404,9 @@ WriteMakefile(
? '$(O_FILES)'
: 'SQLite.o dbdimp.o'
),
depend => {
'dbdimp.o' => 'dbdimp_tokenizer.inc dbdimp_virtual_table.inc',
},
clean => {
FILES => 'SQLite.xsi config.h tv.log *.old',
},

View file

@ -380,6 +380,35 @@ get_autocommit(dbh)
OUTPUT:
RETVAL
static int
txn_state(SV* dbh, SV *schema = &PL_sv_undef)
ALIAS:
DBD::SQLite::db::sqlite_txn_state = 1
CODE:
{
RETVAL = sqlite_db_txn_state(aTHX_ dbh, schema);
}
OUTPUT:
RETVAL
static int
error_offset(dbh)
SV *dbh
ALIAS:
DBD::SQLite::db::sqlite_error_offset = 1
CODE:
{
#if SQLITE_VERSION_NUMBER >= 3038000
D_imp_dbh(dbh);
RETVAL = sqlite3_error_offset(imp_dbh->db);
#else
RETVAL = -1;
#endif
}
OUTPUT:
RETVAL
MODULE = DBD::SQLite PACKAGE = DBD::SQLite::st
PROTOTYPES: DISABLE

View file

@ -5,6 +5,41 @@ MODULE = DBD::SQLite PACKAGE = DBD::SQLite::Constants
PROTOTYPES: ENABLE
BOOT:
newCONSTSUB( gv_stashpv("DBD::SQLite::Constants", FALSE), "DBD_SQLITE_STRING_MODE_PV", newSVuv(DBD_SQLITE_STRING_MODE_PV) );
newCONSTSUB( gv_stashpv("DBD::SQLite::Constants", FALSE), "DBD_SQLITE_STRING_MODE_BYTES", newSVuv(DBD_SQLITE_STRING_MODE_BYTES) );
newCONSTSUB( gv_stashpv("DBD::SQLite::Constants", FALSE), "DBD_SQLITE_STRING_MODE_UNICODE_NAIVE", newSVuv(DBD_SQLITE_STRING_MODE_UNICODE_NAIVE) );
newCONSTSUB( gv_stashpv("DBD::SQLite::Constants", FALSE), "DBD_SQLITE_STRING_MODE_UNICODE_FALLBACK", newSVuv(DBD_SQLITE_STRING_MODE_UNICODE_FALLBACK) );
newCONSTSUB( gv_stashpv("DBD::SQLite::Constants", FALSE), "DBD_SQLITE_STRING_MODE_UNICODE_STRICT", newSVuv(DBD_SQLITE_STRING_MODE_UNICODE_STRICT) );
#if SQLITE_VERSION_NUMBER >= 3034000
IV
_const_allowed_return_values_from_sqlite3_txn_state_3034000()
ALIAS:
SQLITE_TXN_NONE = SQLITE_TXN_NONE
SQLITE_TXN_READ = SQLITE_TXN_READ
SQLITE_TXN_WRITE = SQLITE_TXN_WRITE
CODE:
RETVAL = ix;
OUTPUT:
RETVAL
#else
IV
_const_allowed_return_values_from_sqlite3_txn_state_3034000_zero()
ALIAS:
SQLITE_TXN_NONE = 1
SQLITE_TXN_READ = 2
SQLITE_TXN_WRITE = 3
CODE:
RETVAL = 0;
OUTPUT:
RETVAL
#endif
IV
_const_authorizer_action_codes()
ALIAS:
@ -458,6 +493,32 @@ _const_database_connection_configuration_options_3031000_zero()
#endif
#if SQLITE_VERSION_NUMBER >= 3042000
IV
_const_database_connection_configuration_options_3042000()
ALIAS:
SQLITE_DBCONFIG_STMT_SCANSTATUS = SQLITE_DBCONFIG_STMT_SCANSTATUS
SQLITE_DBCONFIG_REVERSE_SCANORDER = SQLITE_DBCONFIG_REVERSE_SCANORDER
CODE:
RETVAL = ix;
OUTPUT:
RETVAL
#else
IV
_const_database_connection_configuration_options_3042000_zero()
ALIAS:
SQLITE_DBCONFIG_STMT_SCANSTATUS = 1
SQLITE_DBCONFIG_REVERSE_SCANORDER = 2
CODE:
RETVAL = 0;
OUTPUT:
RETVAL
#endif
#if SQLITE_VERSION_NUMBER >= 3006002
IV
@ -1102,6 +1163,130 @@ _const_extended_result_codes_3031000_zero()
#endif
#if SQLITE_VERSION_NUMBER >= 3032000
IV
_const_extended_result_codes_3032000()
ALIAS:
SQLITE_IOERR_DATA = SQLITE_IOERR_DATA
SQLITE_BUSY_TIMEOUT = SQLITE_BUSY_TIMEOUT
SQLITE_CORRUPT_INDEX = SQLITE_CORRUPT_INDEX
CODE:
RETVAL = ix;
OUTPUT:
RETVAL
#else
IV
_const_extended_result_codes_3032000_zero()
ALIAS:
SQLITE_IOERR_DATA = 1
SQLITE_BUSY_TIMEOUT = 2
SQLITE_CORRUPT_INDEX = 3
CODE:
RETVAL = 0;
OUTPUT:
RETVAL
#endif
#if SQLITE_VERSION_NUMBER >= 3034000
IV
_const_extended_result_codes_3034000()
ALIAS:
SQLITE_IOERR_CORRUPTFS = SQLITE_IOERR_CORRUPTFS
CODE:
RETVAL = ix;
OUTPUT:
RETVAL
#else
IV
_const_extended_result_codes_3034000_zero()
ALIAS:
SQLITE_IOERR_CORRUPTFS = 1
CODE:
RETVAL = 0;
OUTPUT:
RETVAL
#endif
#if SQLITE_VERSION_NUMBER >= 3037000
IV
_const_extended_result_codes_3037000()
ALIAS:
SQLITE_CONSTRAINT_DATATYPE = SQLITE_CONSTRAINT_DATATYPE
CODE:
RETVAL = ix;
OUTPUT:
RETVAL
#else
IV
_const_extended_result_codes_3037000_zero()
ALIAS:
SQLITE_CONSTRAINT_DATATYPE = 1
CODE:
RETVAL = 0;
OUTPUT:
RETVAL
#endif
#if SQLITE_VERSION_NUMBER >= 3041000
IV
_const_extended_result_codes_3041000()
ALIAS:
SQLITE_NOTICE_RBU = SQLITE_NOTICE_RBU
CODE:
RETVAL = ix;
OUTPUT:
RETVAL
#else
IV
_const_extended_result_codes_3041000_zero()
ALIAS:
SQLITE_NOTICE_RBU = 1
CODE:
RETVAL = 0;
OUTPUT:
RETVAL
#endif
#if SQLITE_VERSION_NUMBER >= 3043000
IV
_const_extended_result_codes_3043000()
ALIAS:
SQLITE_IOERR_IN_PAGE = SQLITE_IOERR_IN_PAGE
CODE:
RETVAL = ix;
OUTPUT:
RETVAL
#else
IV
_const_extended_result_codes_3043000_zero()
ALIAS:
SQLITE_IOERR_IN_PAGE = 1
CODE:
RETVAL = 0;
OUTPUT:
RETVAL
#endif
IV
_const_flags_for_file_open_operations()
ALIAS:
@ -1236,6 +1421,54 @@ _const_flags_for_file_open_operations_3031000_zero()
#endif
#if SQLITE_VERSION_NUMBER >= 3033000
IV
_const_flags_for_file_open_operations_3033000()
ALIAS:
SQLITE_OPEN_SUPER_JOURNAL = SQLITE_OPEN_SUPER_JOURNAL
CODE:
RETVAL = ix;
OUTPUT:
RETVAL
#else
IV
_const_flags_for_file_open_operations_3033000_zero()
ALIAS:
SQLITE_OPEN_SUPER_JOURNAL = 1
CODE:
RETVAL = 0;
OUTPUT:
RETVAL
#endif
#if SQLITE_VERSION_NUMBER >= 3037000
IV
_const_flags_for_file_open_operations_3037000()
ALIAS:
SQLITE_OPEN_EXRESCODE = SQLITE_OPEN_EXRESCODE
CODE:
RETVAL = ix;
OUTPUT:
RETVAL
#else
IV
_const_flags_for_file_open_operations_3037000_zero()
ALIAS:
SQLITE_OPEN_EXRESCODE = 1
CODE:
RETVAL = 0;
OUTPUT:
RETVAL
#endif
#if SQLITE_VERSION_NUMBER >= 3008003
IV
@ -1310,6 +1543,30 @@ _const_function_flags_3031000_zero()
#endif
#if SQLITE_VERSION_NUMBER >= 3044001
IV
_const_function_flags_3044001()
ALIAS:
SQLITE_RESULT_SUBTYPE = SQLITE_RESULT_SUBTYPE
CODE:
RETVAL = ix;
OUTPUT:
RETVAL
#else
IV
_const_function_flags_3044001_zero()
ALIAS:
SQLITE_RESULT_SUBTYPE = 1
CODE:
RETVAL = 0;
OUTPUT:
RETVAL
#endif
IV
_const_fundamental_datatypes()
ALIAS:
@ -1317,6 +1574,7 @@ _const_fundamental_datatypes()
SQLITE_FLOAT = SQLITE_FLOAT
SQLITE_BLOB = SQLITE_BLOB
SQLITE_NULL = SQLITE_NULL
SQLITE_TEXT = SQLITE_TEXT
CODE:
RETVAL = ix;
OUTPUT:
@ -1690,3 +1948,51 @@ _const__flags_for_file_open_operations_3031000_zero()
#endif
#if SQLITE_VERSION_NUMBER >= 3033000
IV
_const__flags_for_file_open_operations_3033000()
ALIAS:
OPEN_SUPER_JOURNAL = SQLITE_OPEN_SUPER_JOURNAL
CODE:
RETVAL = ix;
OUTPUT:
RETVAL
#else
IV
_const__flags_for_file_open_operations_3033000_zero()
ALIAS:
OPEN_SUPER_JOURNAL = 1
CODE:
RETVAL = 0;
OUTPUT:
RETVAL
#endif
#if SQLITE_VERSION_NUMBER >= 3037000
IV
_const__flags_for_file_open_operations_3037000()
ALIAS:
OPEN_EXRESCODE = SQLITE_OPEN_EXRESCODE
CODE:
RETVAL = ix;
OUTPUT:
RETVAL
#else
IV
_const__flags_for_file_open_operations_3037000_zero()
ALIAS:
OPEN_EXRESCODE = 1
CODE:
RETVAL = 0;
OUTPUT:
RETVAL
#endif

374
dbdimp.c
View file

@ -239,11 +239,11 @@ void
init_cxt() {
dTHX;
MY_CXT_INIT;
MY_CXT.last_dbh_is_unicode = 0;
MY_CXT.last_dbh_string_mode = DBD_SQLITE_STRING_MODE_PV;
}
SV *
stacked_sv_from_sqlite3_value(pTHX_ sqlite3_value *value, int is_unicode)
stacked_sv_from_sqlite3_value(pTHX_ sqlite3_value *value, dbd_sqlite_string_mode_t string_mode)
{
STRLEN len;
sqlite_int64 iv;
@ -271,9 +271,7 @@ stacked_sv_from_sqlite3_value(pTHX_ sqlite3_value *value, int is_unicode)
case SQLITE_TEXT:
len = sqlite3_value_bytes(value);
sv = newSVpvn((const char *)sqlite3_value_text(value), len);
if (is_unicode) {
SvUTF8_on(sv);
}
DBD_SQLITE_UTF8_DECODE_IF_NEEDED(sv, string_mode);
return sv_2mortal(sv);
case SQLITE_BLOB:
len = sqlite3_value_bytes(value);
@ -296,6 +294,7 @@ sqlite_set_result(pTHX_ sqlite3_context *context, SV *result, int is_error)
sqlite3_int64 iv;
AV *av;
SV *result2, *type;
SV **presult2, **ptype;
if ( is_error ) {
s = SvPV(result, len);
@ -309,8 +308,10 @@ sqlite_set_result(pTHX_ sqlite3_context *context, SV *result, int is_error)
} else if( SvROK(result) && SvTYPE(SvRV(result)) == SVt_PVAV ) {
av = (AV*)SvRV(result);
if ( av_len(av) == 1 ) {
result2 = av_shift(av);
type = av_shift(av);
presult2 = av_fetch(av, 0, 0);
ptype = av_fetch(av, 1, 0);
result2 = presult2 ? *presult2 : &PL_sv_undef;
type = ptype ? *ptype : &PL_sv_undef;
if ( SvIOK(type) ) {
switch(sqlite_type_from_odbc_type(SvIV(type))) {
case SQLITE_INTEGER:
@ -404,8 +405,18 @@ sqlite_is_number(pTHX_ const char *v, int sql_type)
if (!_sqlite_atoi64(v, &iv)) return 1;
}
if (sql_type != SQLITE_INTEGER) {
sprintf(format, (has_plus ? "+%%.%df" : "%%.%df"), precision);
#ifdef USE_QUADMATH
sprintf(format, (has_plus ? "+%%.%dQf" : "%%.%dQf"), precision);
# if defined(WIN32)
/* On Windows quadmath, we need to use strtoflt128(), not atov() */
if (strEQ(form(format, strtoflt128(v, NULL)), v)) return 2;
# else
if (strEQ(form(format, atof(v)), v)) return 2;
# endif
#else
sprintf(format, (has_plus ? "+%%.%df" : "%%.%df" ), precision);
if (strEQ(form(format, atof(v)), v)) return 2;
#endif
}
return 0;
}
@ -428,6 +439,44 @@ sqlite_discon_all(SV *drh, imp_drh_t *imp_drh)
return FALSE; /* no way to do this */
}
#define _croak_invalid_value(name, value) \
croak("Invalid value (%s) given for %s", value, name);
/* Like SvUV but croaks on anything other than an unsigned int. */
static inline int
my_SvUV_strict(pTHX_ SV *input, const char* name)
{
if (SvUOK(input)) {
return SvUV(input);
}
const char* pv = SvPVbyte_nolen(input);
UV uv;
int numtype = grok_number(pv, strlen(pv), &uv);
/* Anything else is invalid: */
if (numtype != IS_NUMBER_IN_UV) _croak_invalid_value(name, pv);
return uv;
}
static inline dbd_sqlite_string_mode_t
_extract_sqlite_string_mode_from_sv( pTHX_ SV* input )
{
if (SvOK(input)) {
UV val = my_SvUV_strict(aTHX_ input, "sqlite_string_mode");
if (val >= _DBD_SQLITE_STRING_MODE_COUNT) {
_croak_invalid_value("sqlite_string_mode", SvPVbyte_nolen(input));
}
return val;
}
return DBD_SQLITE_STRING_MODE_PV;
}
int
sqlite_db_login6(SV *dbh, imp_dbh_t *imp_dbh, char *dbname, char *user, char *pass, SV *attr)
{
@ -437,7 +486,7 @@ sqlite_db_login6(SV *dbh, imp_dbh_t *imp_dbh, char *dbname, char *user, char *pa
SV **val;
int extended = 0;
int flag = 0;
int unicode = 0;
dbd_sqlite_string_mode_t string_mode = DBD_SQLITE_STRING_MODE_PV;
sqlite_trace(dbh, imp_dbh, 3, form("login '%s' (version %s)", dbname, sqlite3_version));
@ -460,13 +509,24 @@ sqlite_db_login6(SV *dbh, imp_dbh_t *imp_dbh, char *dbname, char *user, char *pa
hv_stores(hv, "ReadOnly", newSViv(1));
}
}
/* sqlite_unicode should be detected earlier, to register default functions correctly */
if (hv_exists(hv, "sqlite_unicode", 14)) {
/* sqlite_string_mode should be detected earlier, to register default functions correctly */
SV** string_mode_svp = hv_fetchs(hv, "sqlite_string_mode", 0);
if (string_mode_svp != NULL && SvOK(*string_mode_svp)) {
string_mode = _extract_sqlite_string_mode_from_sv(aTHX_ *string_mode_svp);
/* Legacy alternatives to sqlite_string_mode: */
} else if (hv_exists(hv, "sqlite_unicode", 14)) {
val = hv_fetch(hv, "sqlite_unicode", 14, 0);
unicode = (val && SvOK(*val)) ? SvIV(*val) : 0;
if ( (val && SvOK(*val)) ? SvIV(*val) : 0 ) {
string_mode = DBD_SQLITE_STRING_MODE_UNICODE_NAIVE;
}
} else if (hv_exists(hv, "unicode", 7)) {
val = hv_fetch(hv, "unicode", 7, 0);
unicode = (val && SvOK(*val)) ? SvIV(*val) : 0;
if ( (val && SvOK(*val)) ? SvIV(*val) : 0 ) {
string_mode = DBD_SQLITE_STRING_MODE_UNICODE_NAIVE;
}
}
}
rc = sqlite_open2(dbname, &(imp_dbh->db), flag, extended);
@ -475,7 +535,7 @@ sqlite_db_login6(SV *dbh, imp_dbh_t *imp_dbh, char *dbname, char *user, char *pa
}
DBIc_IMPSET_on(imp_dbh);
imp_dbh->unicode = unicode;
imp_dbh->string_mode = string_mode;
imp_dbh->functions = newAV();
imp_dbh->aggregates = newAV();
imp_dbh->collation_needed_callback = newSVsv( &PL_sv_undef );
@ -543,9 +603,7 @@ sqlite_db_do_sv(SV *dbh, imp_dbh_t *imp_dbh, SV *sv_statement)
}
/* sqlite3_prepare wants an utf8-encoded SQL statement */
if (imp_dbh->unicode) {
sv_utf8_upgrade(sv_statement);
}
DBD_SQLITE_PREP_SV_FOR_SQLITE(sv_statement, imp_dbh->string_mode);
statement = SvPV_nolen(sv_statement);
@ -732,6 +790,10 @@ sqlite_db_destroy(SV *dbh, imp_dbh_t *imp_dbh)
DBIc_IMPSET_off(imp_dbh);
}
#define _warn_deprecated_if_possible(old, new) \
if (DBIc_has(imp_dbh, DBIcf_WARN)) \
warn("\"%s\" attribute will be deprecated. Use \"%s\" instead.", old, new);
int
sqlite_db_STORE_attrib(SV *dbh, imp_dbh_t *imp_dbh, SV *keysv, SV *valuesv)
{
@ -784,26 +846,44 @@ sqlite_db_STORE_attrib(SV *dbh, imp_dbh_t *imp_dbh, SV *keysv, SV *valuesv)
imp_dbh->prefer_numeric_type = !(! SvTRUE(valuesv));
return TRUE;
}
if (strEQ(key, "sqlite_string_mode")) {
dbd_sqlite_string_mode_t string_mode = _extract_sqlite_string_mode_from_sv(aTHX_ valuesv);
#if PERL_UNICODE_DOES_NOT_WORK_WELL
if (string_mode & DBD_SQLITE_STRING_MODE_UNICODE_ANY) {
sqlite_trace(dbh, imp_dbh, 3, form("Unicode support is disabled for this version of perl."));
string_mode = DBD_SQLITE_STRING_MODE_PV;
}
#endif
imp_dbh->string_mode = string_mode;
return TRUE;
}
if (strEQ(key, "sqlite_unicode")) {
/* it's too early to warn the deprecation of sqlite_unicode as it's widely used */
#if PERL_UNICODE_DOES_NOT_WORK_WELL
sqlite_trace(dbh, imp_dbh, 3, form("Unicode support is disabled for this version of perl."));
imp_dbh->unicode = 0;
imp_dbh->string_mode = DBD_SQLITE_STRING_MODE_PV;
#else
imp_dbh->unicode = !(! SvTRUE(valuesv));
imp_dbh->string_mode = SvTRUE(valuesv) ? DBD_SQLITE_STRING_MODE_UNICODE_NAIVE : DBD_SQLITE_STRING_MODE_PV;
#endif
return TRUE;
}
if (strEQ(key, "unicode")) {
if (DBIc_has(imp_dbh, DBIcf_WARN))
warn("\"unicode\" attribute will be deprecated. Use \"sqlite_unicode\" instead.");
_warn_deprecated_if_possible(key, "sqlite_string_mode");
#if PERL_UNICODE_DOES_NOT_WORK_WELL
sqlite_trace(dbh, imp_dbh, 3, form("Unicode support is disabled for this version of perl."));
imp_dbh->unicode = 0;
imp_dbh->string_mode = DBD_SQLITE_STRING_MODE_PV;
#else
imp_dbh->unicode = !(! SvTRUE(valuesv));
imp_dbh->string_mode = SvTRUE(valuesv) ? DBD_SQLITE_STRING_MODE_UNICODE_NAIVE : DBD_SQLITE_STRING_MODE_PV;
#endif
return TRUE;
}
return FALSE;
}
@ -831,22 +911,18 @@ sqlite_db_FETCH_attrib(SV *dbh, imp_dbh_t *imp_dbh, SV *keysv)
if (strEQ(key, "sqlite_prefer_numeric_type")) {
return sv_2mortal(newSViv(imp_dbh->prefer_numeric_type ? 1 : 0));
}
if (strEQ(key, "sqlite_unicode")) {
#if PERL_UNICODE_DOES_NOT_WORK_WELL
sqlite_trace(dbh, imp_dbh, 3, "Unicode support is disabled for this version of perl.");
return sv_2mortal(newSViv(0));
#else
return sv_2mortal(newSViv(imp_dbh->unicode ? 1 : 0));
#endif
if (strEQ(key, "sqlite_string_mode")) {
return sv_2mortal(newSVuv(imp_dbh->string_mode));
}
if (strEQ(key, "unicode")) {
if (DBIc_has(imp_dbh, DBIcf_WARN))
warn("\"unicode\" attribute will be deprecated. Use \"sqlite_unicode\" instead.");
if (strEQ(key, "sqlite_unicode") || strEQ(key, "unicode")) {
_warn_deprecated_if_possible(key, "sqlite_string_mode");
#if PERL_UNICODE_DOES_NOT_WORK_WELL
sqlite_trace(dbh, imp_dbh, 3, "Unicode support is disabled for this version of perl.");
return sv_2mortal(newSViv(0));
#else
return sv_2mortal(newSViv(imp_dbh->unicode ? 1 : 0));
return sv_2mortal(newSViv(imp_dbh->string_mode == DBD_SQLITE_STRING_MODE_UNICODE_NAIVE ? 1 : 0));
#endif
}
@ -879,7 +955,7 @@ sqlite_st_prepare_sv(SV *sth, imp_sth_t *imp_sth, SV *sv_statement, SV *attribs)
stmt_list_s * new_stmt;
D_imp_dbh_from_sth;
MY_CXT.last_dbh_is_unicode = imp_dbh->unicode;
MY_CXT.last_dbh_string_mode = imp_dbh->string_mode;
if (!DBIc_ACTIVE(imp_dbh)) {
sqlite_error(sth, -2, "attempt to prepare on inactive database handle");
@ -887,9 +963,7 @@ sqlite_st_prepare_sv(SV *sth, imp_sth_t *imp_sth, SV *sv_statement, SV *attribs)
}
/* sqlite3_prepare wants an utf8-encoded SQL statement */
if (imp_dbh->unicode) {
sv_utf8_upgrade(sv_statement);
}
DBD_SQLITE_PREP_SV_FOR_SQLITE(sv_statement, imp_dbh->string_mode);
statement = SvPV_nolen(sv_statement);
@ -1003,10 +1077,15 @@ sqlite_st_execute(SV *sth, imp_sth_t *imp_sth)
const char *data;
int numtype = 0;
if (imp_dbh->unicode) {
sv_utf8_upgrade(value);
if (imp_dbh->string_mode & DBD_SQLITE_STRING_MODE_UNICODE_ANY) {
data = SvPVutf8(value, len);
}
else if (imp_dbh->string_mode == DBD_SQLITE_STRING_MODE_BYTES) {
data = SvPVbyte(value, len);
}
else {
data = SvPV(value, len);
}
data = SvPV(value, len);
/*
* XXX: For backward compatibility, it'd be better to
@ -1217,11 +1296,9 @@ sqlite_st_fetch(SV *sth, imp_sth_t *imp_sth)
}
}
sv_setpvn(AvARRAY(av)[i], val, len);
if (imp_dbh->unicode) {
SvUTF8_on(AvARRAY(av)[i]);
} else {
SvUTF8_off(AvARRAY(av)[i]);
}
DBD_SQLITE_UTF8_DECODE_IF_NEEDED(AvARRAY(av)[i], imp_dbh->string_mode);
break;
case SQLITE_BLOB:
sqlite_trace(sth, imp_sth, 5, form("fetch column %d as blob", i));
@ -1393,8 +1470,9 @@ sqlite_st_FETCH_attrib(SV *sth, imp_sth_t *imp_sth, SV *keysv)
/* if (dot) drop table name from field name */
/* fieldname = ++dot; */
SV *sv_fieldname = newSVpv(fieldname, 0);
if (imp_dbh->unicode)
SvUTF8_on(sv_fieldname);
DBD_SQLITE_UTF8_DECODE_IF_NEEDED(sv_fieldname, imp_dbh->string_mode);
av_store(av, n, sv_fieldname);
}
}
@ -1688,7 +1766,7 @@ sqlite_db_busy_timeout(pTHX_ SV *dbh, SV *timeout )
}
static void
sqlite_db_func_dispatcher(int is_unicode, sqlite3_context *context, int argc, sqlite3_value **value)
sqlite_db_func_dispatcher(dbd_sqlite_string_mode_t string_mode, sqlite3_context *context, int argc, sqlite3_value **value)
{
dTHX;
dSP;
@ -1703,7 +1781,7 @@ sqlite_db_func_dispatcher(int is_unicode, sqlite3_context *context, int argc, sq
PUSHMARK(SP);
for ( i=0; i < argc; i++ ) {
XPUSHs(stacked_sv_from_sqlite3_value(aTHX_ value[i], is_unicode));
XPUSHs(stacked_sv_from_sqlite3_value(aTHX_ value[i], string_mode));
}
PUTBACK;
@ -1734,17 +1812,46 @@ sqlite_db_func_dispatcher(int is_unicode, sqlite3_context *context, int argc, sq
}
static void
sqlite_db_func_dispatcher_unicode(sqlite3_context *context, int argc, sqlite3_value **value)
sqlite_db_func_dispatcher_unicode_naive(sqlite3_context *context, int argc, sqlite3_value **value)
{
sqlite_db_func_dispatcher(1, context, argc, value);
sqlite_db_func_dispatcher(DBD_SQLITE_STRING_MODE_UNICODE_NAIVE, context, argc, value);
}
static void
sqlite_db_func_dispatcher_no_unicode(sqlite3_context *context, int argc, sqlite3_value **value)
sqlite_db_func_dispatcher_unicode_fallback(sqlite3_context *context, int argc, sqlite3_value **value)
{
sqlite_db_func_dispatcher(0, context, argc, value);
sqlite_db_func_dispatcher(DBD_SQLITE_STRING_MODE_UNICODE_FALLBACK, context, argc, value);
}
static void
sqlite_db_func_dispatcher_unicode_strict(sqlite3_context *context, int argc, sqlite3_value **value)
{
sqlite_db_func_dispatcher(DBD_SQLITE_STRING_MODE_UNICODE_STRICT, context, argc, value);
}
static void
sqlite_db_func_dispatcher_bytes(sqlite3_context *context, int argc, sqlite3_value **value)
{
sqlite_db_func_dispatcher(DBD_SQLITE_STRING_MODE_BYTES, context, argc, value);
}
static void
sqlite_db_func_dispatcher_pv(sqlite3_context *context, int argc, sqlite3_value **value)
{
sqlite_db_func_dispatcher(DBD_SQLITE_STRING_MODE_PV, context, argc, value);
}
typedef void (*dispatch_func_t)(sqlite3_context*, int, sqlite3_value**);
static dispatch_func_t _FUNC_DISPATCHER[_DBD_SQLITE_STRING_MODE_COUNT] = {
sqlite_db_func_dispatcher_pv,
sqlite_db_func_dispatcher_bytes,
NULL, NULL,
sqlite_db_func_dispatcher_unicode_naive,
sqlite_db_func_dispatcher_unicode_fallback,
sqlite_db_func_dispatcher_unicode_strict,
};
int
sqlite_db_create_function(pTHX_ SV *dbh, const char *name, int argc, SV *func, int flags)
{
@ -1758,17 +1865,20 @@ sqlite_db_create_function(pTHX_ SV *dbh, const char *name, int argc, SV *func, i
}
/* Copy the function reference */
func_sv = newSVsv(func);
av_push( imp_dbh->functions, func_sv );
if (SvOK(func)) {
func_sv = newSVsv(func);
av_push( imp_dbh->functions, func_sv );
}
croak_if_db_is_null();
/* warn("create_function %s with %d args\n", name, argc); */
rc = sqlite3_create_function( imp_dbh->db, name, argc, SQLITE_UTF8|flags,
func_sv,
imp_dbh->unicode ? sqlite_db_func_dispatcher_unicode
: sqlite_db_func_dispatcher_no_unicode,
NULL, NULL );
if (SvOK(func)) {
rc = sqlite3_create_function( imp_dbh->db, name, argc, SQLITE_UTF8|flags,
func_sv, _FUNC_DISPATCHER[imp_dbh->string_mode], NULL, NULL );
} else {
rc = sqlite3_create_function( imp_dbh->db, name, argc, SQLITE_UTF8|flags, NULL, NULL, NULL, NULL );
}
if ( rc != SQLITE_OK ) {
sqlite_error(dbh, rc, form("sqlite_create_function failed with error %s", sqlite3_errmsg(imp_dbh->db)));
return FALSE;
@ -1824,6 +1934,21 @@ sqlite_db_load_extension(pTHX_ SV *dbh, const char *file, const char *proc)
#endif
SV* _lc(pTHX_ SV* sv) {
int i, l;
char* pv;
if (SvPOK(sv)) {
pv = SvPV_nolen(sv);
l = strlen(pv);
for(i = 0; i < l; i++) {
if (pv[i] >= 'A' && pv[i] <= 'Z') {
pv[i] = pv[i] - 'A' + 'a';
}
}
}
return sv;
}
HV*
sqlite_db_table_column_metadata(pTHX_ SV *dbh, SV *dbname, SV *tablename, SV *columnname)
{
@ -1860,7 +1985,7 @@ sqlite_db_table_column_metadata(pTHX_ SV *dbh, SV *dbname, SV *tablename, SV *co
#endif
if (rc == SQLITE_OK) {
hv_stores(metadata, "data_type", datatype ? newSVpv(datatype, 0) : newSV(0));
hv_stores(metadata, "data_type", datatype ? _lc(aTHX_ newSVpv(datatype, 0)) : newSV(0));
hv_stores(metadata, "collation_name", collseq ? newSVpv(collseq, 0) : newSV(0));
hv_stores(metadata, "not_null", newSViv(notnull));
hv_stores(metadata, "primary", newSViv(primary));
@ -1932,7 +2057,7 @@ sqlite_db_aggr_step_dispatcher(sqlite3_context *context,
{
dTHX;
dSP;
int i, is_unicode = 0; /* TODO : find out from db handle */
int i, string_mode = DBD_SQLITE_STRING_MODE_PV; /* TODO : find out from db handle */
aggrInfo *aggr;
aggr = sqlite3_aggregate_context(context, sizeof (aggrInfo));
@ -1954,7 +2079,7 @@ sqlite_db_aggr_step_dispatcher(sqlite3_context *context,
PUSHMARK(SP);
XPUSHs( sv_2mortal( newSVsv( aggr->aggr_inst ) ));
for ( i=0; i < argc; i++ ) {
XPUSHs(stacked_sv_from_sqlite3_value(aTHX_ value[i], is_unicode));
XPUSHs(stacked_sv_from_sqlite3_value(aTHX_ value[i], string_mode));
}
PUTBACK;
@ -2070,71 +2195,78 @@ sqlite_db_create_aggregate(pTHX_ SV *dbh, const char *name, int argc, SV *aggr_p
return TRUE;
}
#define SQLITE_DB_COLLATION_BASE(func, sv1, sv2) STMT_START { \
int cmp = 0; \
int n_retval, i; \
\
ENTER; \
SAVETMPS; \
PUSHMARK(SP); \
XPUSHs( sv_2mortal( sv1 ) ); \
XPUSHs( sv_2mortal( sv2 ) ); \
PUTBACK; \
n_retval = call_sv(func, G_SCALAR); \
SPAGAIN; \
if (n_retval != 1) { \
warn("collation function returned %d arguments", n_retval); \
} \
for(i = 0; i < n_retval; i++) { \
cmp = POPi; \
} \
PUTBACK; \
FREETMPS; \
LEAVE; \
\
return cmp; \
} STMT_END
int
sqlite_db_collation_dispatcher(void *func, int len1, const void *string1,
int len2, const void *string2)
{
dTHX;
dSP;
int cmp = 0;
int n_retval, i;
ENTER;
SAVETMPS;
PUSHMARK(SP);
XPUSHs( sv_2mortal( newSVpvn( string1, len1) ) );
XPUSHs( sv_2mortal( newSVpvn( string2, len2) ) );
PUTBACK;
n_retval = call_sv(func, G_SCALAR);
SPAGAIN;
if (n_retval != 1) {
warn("collation function returned %d arguments", n_retval);
}
for(i = 0; i < n_retval; i++) {
cmp = POPi;
}
PUTBACK;
FREETMPS;
LEAVE;
return cmp;
SQLITE_DB_COLLATION_BASE(func, newSVpvn( string1, len1), newSVpvn( string2, len2));
}
int
sqlite_db_collation_dispatcher_utf8(void *func, int len1, const void *string1,
sqlite_db_collation_dispatcher_utf8_naive(void *func, int len1, const void *string1,
int len2, const void *string2)
{
dTHX;
dSP;
int cmp = 0;
int n_retval, i;
SV *sv1, *sv2;
ENTER;
SAVETMPS;
PUSHMARK(SP);
sv1 = newSVpvn(string1, len1);
SvUTF8_on(sv1);
sv2 = newSVpvn(string2, len2);
SvUTF8_on(sv2);
XPUSHs( sv_2mortal( sv1 ) );
XPUSHs( sv_2mortal( sv2 ) );
PUTBACK;
n_retval = call_sv(func, G_SCALAR);
SPAGAIN;
if (n_retval != 1) {
warn("collation function returned %d arguments", n_retval);
}
for(i = 0; i < n_retval; i++) {
cmp = POPi;
}
PUTBACK;
FREETMPS;
LEAVE;
return cmp;
SQLITE_DB_COLLATION_BASE(func, newSVpvn_flags( string1, len1, SVf_UTF8), newSVpvn_flags( string2, len2, SVf_UTF8));
}
int
sqlite_db_collation_dispatcher_utf8_fallback(void *func, int len1, const void *string1,
int len2, const void *string2)
{
dTHX;
dSP;
SV* sv1 = newSVpvn( string1, len1);
SV* sv2 = newSVpvn( string2, len2);
DBD_SQLITE_UTF8_DECODE_WITH_FALLBACK(sv1);
DBD_SQLITE_UTF8_DECODE_WITH_FALLBACK(sv2);
SQLITE_DB_COLLATION_BASE(func, sv1, sv2);
}
typedef int (*collation_dispatch_func_t)(void *, int, const void *, int, const void *);
static collation_dispatch_func_t _COLLATION_DISPATCHER[_DBD_SQLITE_STRING_MODE_COUNT] = {
sqlite_db_collation_dispatcher,
sqlite_db_collation_dispatcher,
NULL, NULL,
sqlite_db_collation_dispatcher_utf8_naive,
sqlite_db_collation_dispatcher_utf8_fallback,
sqlite_db_collation_dispatcher_utf8_fallback,
};
int
sqlite_db_create_collation(pTHX_ SV *dbh, const char *name, SV *func)
{
@ -2170,8 +2302,7 @@ sqlite_db_create_collation(pTHX_ SV *dbh, const char *name, SV *func)
rv = sqlite3_create_collation(
imp_dbh->db, name, SQLITE_UTF8,
func_sv,
imp_dbh->unicode ? sqlite_db_collation_dispatcher_utf8
: sqlite_db_collation_dispatcher
_COLLATION_DISPATCHER[imp_dbh->string_mode]
);
if ( rv != SQLITE_OK ) {
@ -2844,6 +2975,21 @@ sqlite_db_get_autocommit(pTHX_ SV *dbh)
return sqlite3_get_autocommit(imp_dbh->db);
}
int
sqlite_db_txn_state(pTHX_ SV *dbh, SV *schema)
{
#if SQLITE_VERSION_NUMBER >= 3034000
D_imp_dbh(dbh);
if (SvOK(schema) && SvPOK(schema)) {
return sqlite3_txn_state(imp_dbh->db, SvPV_nolen(schema));
} else {
return sqlite3_txn_state(imp_dbh->db, NULL);
}
#else
return -1;
#endif
}
#include "dbdimp_tokenizer.inc"
#include "dbdimp_virtual_table.inc"

View file

@ -7,8 +7,24 @@
#define MY_CXT_KEY "DBD::SQLite::_guts" XS_VERSION
typedef enum {
DBD_SQLITE_STRING_MODE_PV,
DBD_SQLITE_STRING_MODE_BYTES,
/* Leave space here so that we can use DBD_SQLITE_STRING_MODE_UNICODE_ANY
as a means of checking for any unicode mode. */
DBD_SQLITE_STRING_MODE_UNICODE_NAIVE = 4,
DBD_SQLITE_STRING_MODE_UNICODE_FALLBACK,
DBD_SQLITE_STRING_MODE_UNICODE_STRICT,
_DBD_SQLITE_STRING_MODE_COUNT,
} dbd_sqlite_string_mode_t;
#define DBD_SQLITE_STRING_MODE_UNICODE_ANY DBD_SQLITE_STRING_MODE_UNICODE_NAIVE
typedef struct {
int last_dbh_is_unicode;
dbd_sqlite_string_mode_t last_dbh_string_mode;
} my_cxt_t;
#define PERL_UNICODE_DOES_NOT_WORK_WELL \
@ -22,6 +38,41 @@ typedef struct {
#define sqlite3_int64 sqlite_int64
#endif
#define DBD_SQLITE_UTF8_DECODE_NAIVE(sv) SvUTF8_on(sv)
#define DBD_SQLITE_UTF8_DECODE_CHECKED(sv, onfail) ( \
is_utf8_string((U8*) SvPVX(sv), SvCUR(sv)) \
? SvUTF8_on(sv) \
: onfail("Received invalid UTF-8 from SQLite; cannot decode!") \
)
#define DBD_SQLITE_UTF8_DECODE_WITH_FALLBACK(sv) ( \
DBD_SQLITE_UTF8_DECODE_CHECKED(sv, warn) \
)
#define DBD_SQLITE_UTF8_DECODE_STRICT(sv) ( \
DBD_SQLITE_UTF8_DECODE_CHECKED(sv, croak) \
)
#define DBD_SQLITE_PREP_SV_FOR_SQLITE(sv, string_mode) STMT_START { \
if (string_mode & DBD_SQLITE_STRING_MODE_UNICODE_ANY) { \
sv_utf8_upgrade(sv); \
} \
else if (string_mode == DBD_SQLITE_STRING_MODE_BYTES) { \
sv_utf8_downgrade(sv, 0); \
} \
} STMT_END
#define DBD_SQLITE_UTF8_DECODE_IF_NEEDED(sv, string_mode) ( \
string_mode == DBD_SQLITE_STRING_MODE_UNICODE_NAIVE \
? DBD_SQLITE_UTF8_DECODE_NAIVE(sv) \
: string_mode == DBD_SQLITE_STRING_MODE_UNICODE_FALLBACK \
? DBD_SQLITE_UTF8_DECODE_WITH_FALLBACK(sv) \
: string_mode == DBD_SQLITE_STRING_MODE_UNICODE_STRICT \
? DBD_SQLITE_UTF8_DECODE_STRICT(sv) \
: 0 \
)
/* A linked list of statements prepared by this module */
typedef struct stmt_list_s stmt_list_s;
@ -41,7 +92,7 @@ struct imp_dbh_st {
dbih_dbc_t com;
/* sqlite specific bits */
sqlite3 *db;
bool unicode;
dbd_sqlite_string_mode_t string_mode;
bool handle_binary_nulls;
int timeout;
AV *functions;
@ -137,6 +188,7 @@ int sqlite_db_create_module(pTHX_ SV *dbh, const char *name, const char *perl_cl
int sqlite_db_limit(pTHX_ SV *dbh, int id, int new_value);
int sqlite_db_config(pTHX_ SV *dbh, int id, int new_value);
int sqlite_db_get_autocommit(pTHX_ SV *dbh);
int sqlite_db_txn_state(pTHX_ SV *dbh, SV *schema);
int sqlite_db_do_sv(SV *dbh, imp_dbh_t *imp_dbh, SV *sv_statement);
void init_cxt();

View file

@ -12,8 +12,8 @@ typedef struct perl_tokenizer_cursor {
/* members below are only used if the input string is in utf8 */
const char *pInput; /* input we are tokenizing */
const char *lastByteOffset; /* offset into pInput */
int lastCharOffset; /* char offset corresponding to lastByteOffset */
const char *currentByte; /* pointer into pInput */
int currentChar; /* char position corresponding to currentByte */
} perl_tokenizer_cursor;
/*
@ -94,6 +94,30 @@ static int perl_tokenizer_Open(
SV *perl_string;
int n_retval;
/* build a Perl copy of the input string */
if (nBytes < 0) { /* we get -1 from fts3. Don't know why ! */
nBytes = strlen(pInput);
}
/* SVs_TEMP will call sv_2mortal */
perl_string = newSVpvn_flags(pInput, nBytes, SVs_TEMP);
switch (MY_CXT.last_dbh_string_mode) {
DBD_SQLITE_STRING_MODE_UNICODE_NAIVE:
DBD_SQLITE_UTF8_DECODE_NAIVE(perl_string);
break;
DBD_SQLITE_STRING_MODE_UNICODE_FALLBACK:
DBD_SQLITE_STRING_MODE_UNICODE_STRICT:
DBD_SQLITE_UTF8_DECODE_WITH_FALLBACK(perl_string);
break;
default:
break;
}
DBD_SQLITE_UTF8_DECODE_IF_NEEDED(perl_string, MY_CXT.last_dbh_string_mode);
perl_tokenizer *t = (perl_tokenizer *)pTokenizer;
/* allocate and initialize the cursor struct */
@ -102,29 +126,17 @@ static int perl_tokenizer_Open(
memset(c, 0, sizeof(*c));
*ppCursor = &c->base;
/* flags for creating the Perl SV containing the input string */
flags = SVs_TEMP; /* will call sv_2mortal */
/* special handling if working with utf8 strings */
if (MY_CXT.last_dbh_is_unicode) {
if (MY_CXT.last_dbh_string_mode & DBD_SQLITE_STRING_MODE_UNICODE_ANY) {
/* data to keep track of byte offsets */
c->lastByteOffset = c->pInput = pInput;
c->lastCharOffset = 0;
/* string passed to Perl needs to be flagged as utf8 */
flags |= SVf_UTF8;
/* data to keep track of byte positions */
c->currentByte = c->pInput = pInput;
c->currentChar = 0;
}
ENTER;
SAVETMPS;
/* build a Perl copy of the input string */
if (nBytes < 0) { /* we get -1 from fts3. Don't know why ! */
nBytes = strlen(pInput);
}
perl_string = newSVpvn_flags(pInput, nBytes, flags);
/* call the tokenizer coderef */
PUSHMARK(SP);
XPUSHs(perl_string);
@ -134,7 +146,7 @@ static int perl_tokenizer_Open(
/* store the cursor coderef returned by the tokenizer */
if (n_retval != 1) {
warn("tokenizer returned %d arguments", n_retval);
warn("tokenizer returned %d arguments, expected 1", n_retval);
}
c->coderef = newSVsv(POPs);
@ -164,17 +176,17 @@ static int perl_tokenizer_Close(sqlite3_tokenizer_cursor *pCursor){
*/
static int perl_tokenizer_Next(
sqlite3_tokenizer_cursor *pCursor, /* Cursor returned by perl_tokenizer_Open */
const char **ppToken, /* OUT: *ppToken is the token text */
int *pnBytes, /* OUT: Number of bytes in token */
int *piStartOffset, /* OUT: Starting offset of token */
int *piEndOffset, /* OUT: Ending offset of token */
int *piPosition /* OUT: Position integer of token */
const char **ppToken, /* OUT: Normalized text for token */
int *pnBytes, /* OUT: Number of bytes in normalized text */
int *piStartOffset, /* Starting offset of token. IN : char offset; OUT : byte offset */
int *piEndOffset, /* Ending offset of token. IN : char offset; OUT : byte offset */
int *piPosition /* OUT: Number of tokens returned before this one */
){
perl_tokenizer_cursor *c = (perl_tokenizer_cursor *) pCursor;
int result;
int n_retval;
char *token;
char *byteOffset;
char *nextByte;
STRLEN n_a; /* this is required for older perls < 5.8.8 */
I32 hop;
@ -197,7 +209,7 @@ static int perl_tokenizer_Next(
/* otherwise, get token details from the return list */
else {
if (n_retval != 5) {
warn("tokenizer cursor returned %d arguments", n_retval);
warn("tokenizer cursor returned %d arguments, expected 5", n_retval);
}
*piPosition = POPi;
*piEndOffset = POPi;
@ -206,21 +218,30 @@ static int perl_tokenizer_Next(
token = POPpx;
if (c->pInput) { /* if working with utf8 data */
/* compute first hop : nb of chars from last position to the start of the token */
hop = *piStartOffset - c->currentChar;
/* recompute *pnBytes in bytes, not in chars */
*pnBytes = strlen(token);
/* hop: advance to the first byte in token */
nextByte = (char*)utf8_hop((U8*)c->currentByte, hop);
/* recompute start/end offsets in bytes, not in chars */
hop = *piStartOffset - c->lastCharOffset;
byteOffset = (char*)utf8_hop((U8*)c->lastByteOffset, hop);
hop = *piEndOffset - *piStartOffset;
*piStartOffset = byteOffset - c->pInput;
byteOffset = (char*)utf8_hop((U8*)byteOffset, hop);
*piEndOffset = byteOffset - c->pInput;
/* compute 2nd hop : nb of chars from start of the token to end of token */
hop = *piEndOffset - *piStartOffset;
/* remember where we are for next round */
c->lastCharOffset = *piEndOffset,
c->lastByteOffset = byteOffset;
/* now recompute the start offset in bytes, not in chars */
*piStartOffset = nextByte - c->pInput;
/* 2nd hop: advance past to the last byte in token */
nextByte = (char*)utf8_hop((U8*)nextByte, hop);
/* remember current position (useful for the next invocation) */
c->currentChar = *piEndOffset;
c->currentByte = nextByte;
/* now recompute the end offset in bytes, not in chars */
*piEndOffset = nextByte - c->pInput;
/* compute the size of the normalized token in bytes, not in chars */
*pnBytes = strlen(token);
}
/* make sure we have enough storage for copying the token */
@ -232,8 +253,7 @@ static int perl_tokenizer_Next(
c->pToken = pNew;
}
/* need to copy the token into the C cursor before perl frees that
memory */
/* need to copy the token into the C cursor before perl frees that memory */
memcpy(c->pToken, token, *pnBytes);
*ppToken = c->pToken;

View file

@ -432,7 +432,7 @@ static int perl_vt_Filter( sqlite3_vtab_cursor *pVtabCursor,
dSP;
dMY_CXT;
int i, count;
int is_unicode = MY_CXT.last_dbh_is_unicode;
dbd_sqlite_string_mode_t string_mode = MY_CXT.last_dbh_string_mode;
ENTER;
SAVETMPS;
@ -443,7 +443,7 @@ static int perl_vt_Filter( sqlite3_vtab_cursor *pVtabCursor,
XPUSHs(sv_2mortal(newSViv(idxNum)));
XPUSHs(sv_2mortal(newSVpv(idxStr, 0)));
for(i = 0; i < argc; i++) {
XPUSHs(stacked_sv_from_sqlite3_value(aTHX_ argv[i], is_unicode));
XPUSHs(stacked_sv_from_sqlite3_value(aTHX_ argv[i], string_mode));
}
PUTBACK;
count = call_method("FILTER", G_VOID);
@ -588,7 +588,7 @@ static int perl_vt_Update( sqlite3_vtab *pVTab,
dSP;
dMY_CXT;
int count, i;
int is_unicode = MY_CXT.last_dbh_is_unicode;
dbd_sqlite_string_mode_t string_mode = MY_CXT.last_dbh_string_mode;
int rc = SQLITE_ERROR;
SV *rowidsv;
@ -599,7 +599,7 @@ static int perl_vt_Update( sqlite3_vtab *pVTab,
PUSHMARK(SP);
XPUSHs(((perl_vtab *) pVTab)->perl_vtab_obj);
for(i = 0; i < argc; i++) {
XPUSHs(stacked_sv_from_sqlite3_value(aTHX_ argv[i], is_unicode));
XPUSHs(stacked_sv_from_sqlite3_value(aTHX_ argv[i], string_mode));
}
PUTBACK;
count = call_method ("_SQLITE_UPDATE", G_SCALAR);
@ -704,8 +704,9 @@ static int perl_vt_FindFunction(sqlite3_vtab *pVTab,
/* return function information for sqlite3 within *pxFunc and *ppArg */
is_overloaded = coderef && SvTRUE(coderef);
if (is_overloaded) {
*pxFunc = MY_CXT.last_dbh_is_unicode ? sqlite_db_func_dispatcher_unicode
: sqlite_db_func_dispatcher_no_unicode;
*pxFunc = _FUNC_DISPATCHER[MY_CXT.last_dbh_string_mode];
*ppArg = coderef;
}
@ -814,6 +815,7 @@ sqlite_db_destroy_module_data(void *pAux)
/* free module memory */
SvREFCNT_dec(init_data->dbh);
sqlite3_free((char *)init_data->perl_class);
sqlite3_free(init_data);
PUTBACK;
FREETMPS;

View file

@ -36,7 +36,7 @@
** When an fts3 table is created, it passes any arguments passed to
** the tokenizer clause of the CREATE VIRTUAL TABLE statement to the
** sqlite3_tokenizer_module.xCreate() function of the requested tokenizer
** implementation. The xCreate() function in turn returns an
** implementation. The xCreate() function in turn returns an
** sqlite3_tokenizer structure representing the specific tokenizer to
** be used for the fts3 table (customized by the tokenizer clause arguments).
**
@ -68,7 +68,7 @@ struct sqlite3_tokenizer_module {
** then argc is set to 2, and the argv[] array contains pointers
** to the strings "arg1" and "arg2".
**
** This method should return either SQLITE_OK (0), or an SQLite error
** This method should return either SQLITE_OK (0), or an SQLite error
** code. If SQLITE_OK is returned, then *ppTokenizer should be set
** to point at the newly created tokenizer structure. The generic
** sqlite3_tokenizer.pModule variable should not be initialized by
@ -89,7 +89,7 @@ struct sqlite3_tokenizer_module {
/*
** Create a tokenizer cursor to tokenize an input buffer. The caller
** is responsible for ensuring that the input buffer remains valid
** until the cursor is closed (using the xClose() method).
** until the cursor is closed (using the xClose() method).
*/
int (*xOpen)(
sqlite3_tokenizer *pTokenizer, /* Tokenizer object */
@ -98,7 +98,7 @@ struct sqlite3_tokenizer_module {
);
/*
** Destroy an existing tokenizer cursor. The fts3 module calls this
** Destroy an existing tokenizer cursor. The fts3 module calls this
** method exactly once for each successful call to xOpen().
*/
int (*xClose)(sqlite3_tokenizer_cursor *pCursor);
@ -109,7 +109,7 @@ struct sqlite3_tokenizer_module {
** "OUT" variables identified below, or SQLITE_DONE to indicate that
** the end of the buffer has been reached, or an SQLite error code.
**
** *ppToken should be set to point at a buffer containing the
** *ppToken should be set to point at a buffer containing the
** normalized version of the token (i.e. after any case-folding and/or
** stemming has been performed). *pnBytes should be set to the length
** of this buffer in bytes. The input text that generated the token is
@ -121,7 +121,7 @@ struct sqlite3_tokenizer_module {
**
** The buffer *ppToken is set to point at is managed by the tokenizer
** implementation. It is only required to be valid until the next call
** to xNext() or xClose().
** to xNext() or xClose().
*/
/* TODO(shess) current implementation requires pInput to be
** nul-terminated. This should either be fixed, or pInput/nBytes
@ -139,7 +139,7 @@ struct sqlite3_tokenizer_module {
** Methods below this point are only available if iVersion>=1.
*/
/*
/*
** Configure the language id of a tokenizer cursor.
*/
int (*xLanguageid)(sqlite3_tokenizer_cursor *pCsr, int iLangid);

View file

@ -3,10 +3,9 @@ package DBD::SQLite;
use 5.006;
use strict;
use DBI 1.57 ();
use DynaLoader ();
use XSLoader ();
our $VERSION = '1.65_02';
our @ISA = 'DynaLoader';
our $VERSION = '1.76';
# sqlite_version cache (set in the XS bootstrap)
our ($sqlite_version, $sqlite_version_number);
@ -14,7 +13,7 @@ our ($sqlite_version, $sqlite_version_number);
# not sure if we still need these...
our ($err, $errstr);
__PACKAGE__->bootstrap($VERSION);
XSLoader::load('DBD::SQLite', $VERSION);
# New or old API?
use constant NEWAPI => ($DBI::VERSION >= 1.608);
@ -62,6 +61,8 @@ sub driver {
DBD::SQLite::db->install_method('sqlite_limit');
DBD::SQLite::db->install_method('sqlite_db_config');
DBD::SQLite::db->install_method('sqlite_get_autocommit');
DBD::SQLite::db->install_method('sqlite_txn_state');
DBD::SQLite::db->install_method('sqlite_error_offset');
$methods_are_installed++;
}
@ -1073,7 +1074,7 @@ are limited by the typeless nature of the SQLite database.
=head1 SQLITE VERSION
DBD::SQLite is usually compiled with a bundled SQLite library
(SQLite version S<3.31.1> as of this release) for consistency.
(SQLite version S<3.46.1> as of this release) for consistency.
However, a different version of SQLite may sometimes be used for
some reasons like security, or some new experimental features.
@ -1622,32 +1623,72 @@ Your sweet spot probably lies somewhere in between.
Returns the version of the SQLite library which B<DBD::SQLite> is using,
e.g., "3.26.0". Can only be read.
=item sqlite_unicode
=item sqlite_string_mode
If set to a true value, B<DBD::SQLite> will turn the UTF-8 flag on for all
text strings coming out of the database (this feature is currently disabled
for perl < 5.8.5). For more details on the UTF-8 flag see
L<perlunicode>. The default is for the UTF-8 flag to be turned off.
SQLite strings are simple arrays of bytes, but Perl strings can store any
arbitrary Unicode code point. Thus, DBD::SQLite has to adopt some method
of translating between those two models. This parameter defines that
translation.
Also note that due to some bizarreness in SQLite's type system (see
Accepted values are the following constants:
=over
=item * DBD_SQLITE_STRING_MODE_BYTES: All strings are assumed to
represent bytes. A Perl string that contains any code point above 255
will trigger an exception. This is appropriate for Latin-1 strings,
binary data, pre-encoded UTF-8 strings, etc.
=item * DBD_SQLITE_STRING_MODE_UNICODE_FALLBACK: All Perl strings are encoded
to UTF-8 before being given to SQLite. Perl will B<try> to decode SQLite
strings as UTF-8 when giving them to Perl. Should any such string not be
valid UTF-8, a warning is thrown, and the string is left undecoded.
This is appropriate for strings that are decoded to characters via,
e.g., L<Encode/decode>.
Also note that, due to some bizarreness in SQLite's type system (see
L<https://www.sqlite.org/datatype3.html>), if you want to retain
blob-style behavior for B<some> columns under C<< $dbh->{sqlite_unicode} = 1
>> (say, to store images in the database), you have to state so
blob-style behavior for B<some> columns under DBD_SQLITE_STRING_MODE_UNICODE_FALLBACK
(say, to store images in the database), you have to state so
explicitly using the 3-argument form of L<DBI/bind_param> when doing
updates:
use DBI qw(:sql_types);
$dbh->{sqlite_unicode} = 1;
use DBD::SQLite::Constants ':dbd_sqlite_string_mode';
$dbh->{sqlite_string_mode} = DBD_SQLITE_STRING_MODE_UNICODE_FALLBACK;
my $sth = $dbh->prepare("INSERT INTO mytable (blobcolumn) VALUES (?)");
# Binary_data will be stored as is.
$sth->bind_param(1, $binary_data, SQL_BLOB);
Defining the column type as C<BLOB> in the DDL is B<not> sufficient.
This attribute was originally named as C<unicode>, and renamed to
C<sqlite_unicode> for integrity since version 1.26_06. Old C<unicode>
attribute is still accessible but will be deprecated in the near future.
=item * DBD_SQLITE_STRING_MODE_UNICODE_STRICT: Like
DBD_SQLITE_STRING_MODE_UNICODE_FALLBACK but usually throws an exception
rather than a warning if SQLite sends invalid UTF-8. (In Perl callbacks
from SQLite we still warn instead.)
=item * DBD_SQLITE_STRING_MODE_UNICODE_NAIVE: Like
DBD_SQLITE_STRING_MODE_UNICODE_FALLBACK but uses a "naïve" UTF-8 decoding
method that forgoes validation. This is marginally faster than a validated
decode, but it can also B<corrupt> B<Perl> B<itself!>
=item * DBD_SQLITE_STRING_MODE_PV (default, but B<DO> B<NOT> B<USE>): Like
DBD_SQLITE_STRING_MODE_BYTES, but when translating Perl strings to SQLite
the Perl string's internal byte buffer is given to SQLite. B<This> B<is>
B<bad>, but it's been the default for many years, and changing that would
break existing applications.
=back
=item C<sqlite_unicode> or C<unicode> (deprecated)
If truthy, equivalent to setting C<sqlite_string_mode> to
DBD_SQLITE_STRING_MODE_UNICODE_NAIVE; if falsy, equivalent to
DBD_SQLITE_STRING_MODE_PV.
Prefer C<sqlite_string_mode> in all new code.
=item sqlite_allow_multiple_statements
@ -1708,7 +1749,8 @@ Returns all tables and schemas (databases) as specified in L<DBI/table_info>.
The schema and table arguments will do a C<LIKE> search. You can specify an
ESCAPE character by including an 'Escape' attribute in \%attr. The C<$type>
argument accepts a comma separated list of the following types 'TABLE',
'VIEW', 'LOCAL TEMPORARY' and 'SYSTEM TABLE' (by default all are returned).
'INDEX', 'VIEW', 'TRIGGER', 'LOCAL TEMPORARY' and 'SYSTEM TABLE'
(by default all are returned).
Note that a statement handle is returned, and not a direct list of tables.
The following fields are returned:
@ -1721,8 +1763,8 @@ databases will be in the name given when the database was attached.
B<TABLE_NAME>: The name of the table or view.
B<TABLE_TYPE>: The type of object returned. Will be one of 'TABLE', 'VIEW',
'LOCAL TEMPORARY' or 'SYSTEM TABLE'.
B<TABLE_TYPE>: The type of object returned. Will be one of 'TABLE', 'INDEX',
'VIEW', 'TRIGGER', 'LOCAL TEMPORARY' or 'SYSTEM TABLE'.
=head2 primary_key, primary_key_info
@ -2257,12 +2299,20 @@ Calling this method with a true value enables loading (external)
SQLite3 extensions. After the call, you can load extensions like this:
$dbh->sqlite_enable_load_extension(1);
$sth = $dbh->prepare("select load_extension('libsqlitefunctions.so')")
$sth = $dbh->prepare("select load_extension('libmemvfs.so')")
or die "Cannot prepare: " . $dbh->errstr();
=head2 $dbh->sqlite_load_extension( $file, $proc )
Loading an extension by a select statement (with the "load_extension" SQLite3 function like above) has some limitations. If you need to, say, create other functions from an extension, use this method. $file (a path to the extension) is mandatory, and $proc (an entry point name) is optional. You need to call C<sqlite_enable_load_extension> before calling C<sqlite_load_extension>.
Loading an extension by a select statement (with the "load_extension" SQLite3 function like above) has some limitations. If the extension you want to use creates other functions that are not native to SQLite, use this method instead. $file (a path to the extension) is mandatory, and $proc (an entry point name) is optional. You need to call C<sqlite_enable_load_extension> before calling C<sqlite_load_extension>:
$dbh->sqlite_enable_load_extension(1);
$dbh->sqlite_load_extension('libsqlitefunctions.so')
or die "Cannot load extension: " . $dbh->errstr();
If the extension uses SQLite mutex functions like C<sqlite3_mutex_enter>, then
the extension should be compiled with the same C<SQLITE_THREADSAFE> compile-time
setting as this module, see C<DBD::SQLite::compile_options()>.
=head2 $dbh->sqlite_trace( $code_ref )
@ -2375,6 +2425,20 @@ Returns true if the internal SQLite connection is in an autocommit mode.
This does not always return the same value as C<< $dbh->{AutoCommit} >>.
This returns false if you explicitly issue a C<<BEGIN>> statement.
=head2 $dbh->sqlite_txn_state()
Returns the internal transaction status of SQLite (not of DBI).
Return values (SQLITE_TXN_NONE, SQLITE_TXN_READ, SQLITE_TXN_WRITE)
can be imported from DBD::SQLite::Constants. You may pass an optional
schema name (usually "main"). If SQLite does not support this function,
or if you pass a wrong schema name, -1 is returned.
=head2 $dbh->sqlite_error_offset()
Returns the byte offset of the start of a problematic input SQL token
or -1 if the most recent error does not reference a specific token in
the input SQL (or DBD::SQLite is built with an older version of SQLite).
=head1 DRIVER FUNCTIONS
=head2 DBD::SQLite::compile_options()
@ -2537,18 +2601,17 @@ or
=head2 Unicode handling
If the attribute C<< $dbh->{sqlite_unicode} >> is set, strings coming from
the database and passed to the collation function will be properly
tagged with the utf8 flag; but this only works if the
C<sqlite_unicode> attribute is set B<before> the first call to
a perl collation sequence . The recommended way to activate unicode
is to set the parameter at connection time :
Depending on the C<< $dbh->{sqlite_string_mode} >> value, strings coming
from the database and passed to the collation function may be decoded as
UTF-8. This only works, though, if the C<sqlite_string_mode> attribute is
set B<before> the first call to a perl collation sequence. The recommended
way to activate unicode is to set C<sqlite_string_mode> at connection time:
my $dbh = DBI->connect(
"dbi:SQLite:dbname=foo", "", "",
{
RaiseError => 1,
sqlite_unicode => 1,
RaiseError => 1,
sqlite_string_mode => DBD_SQLITE_STRING_MODE_UNICODE_STRICT,
}
);
@ -2570,7 +2633,7 @@ characters :
use DBD::SQLite;
$DBD::SQLite::COLLATION{no_accents} = sub {
my ( $a, $b ) = map lc, @_;
tr[àâáäåãçðèêéëìîíïñòôóöõøùûúüý]
tr[àâáäåãçðèêéëìîíïñòôóöõøùûúüý]
[aaaaaacdeeeeiiiinoooooouuuuy] for $a, $b;
$a cmp $b;
};

View file

@ -8,6 +8,18 @@ use warnings;
use base 'Exporter';
use DBD::SQLite;
our @EXPORT_OK = (
'DBD_SQLITE_STRING_MODE_PV',
'DBD_SQLITE_STRING_MODE_BYTES',
'DBD_SQLITE_STRING_MODE_UNICODE_NAIVE',
'DBD_SQLITE_STRING_MODE_UNICODE_FALLBACK',
'DBD_SQLITE_STRING_MODE_UNICODE_STRICT',
# allowed_return_values_from_sqlite3_txn_state
qw/
SQLITE_TXN_NONE
SQLITE_TXN_READ
SQLITE_TXN_WRITE
/,
# authorizer_action_codes
qw/
SQLITE_ALTER_TABLE
@ -75,6 +87,8 @@ our @EXPORT_OK = (
SQLITE_DBCONFIG_MAX
SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE
SQLITE_DBCONFIG_RESET_DATABASE
SQLITE_DBCONFIG_REVERSE_SCANORDER
SQLITE_DBCONFIG_STMT_SCANSTATUS
SQLITE_DBCONFIG_TRIGGER_EQP
SQLITE_DBCONFIG_TRUSTED_SCHEMA
SQLITE_DBCONFIG_WRITABLE_SCHEMA
@ -86,6 +100,7 @@ our @EXPORT_OK = (
SQLITE_AUTH_USER
SQLITE_BUSY_RECOVERY
SQLITE_BUSY_SNAPSHOT
SQLITE_BUSY_TIMEOUT
SQLITE_CANTOPEN_CONVPATH
SQLITE_CANTOPEN_DIRTYWAL
SQLITE_CANTOPEN_FULLPATH
@ -94,6 +109,7 @@ our @EXPORT_OK = (
SQLITE_CANTOPEN_SYMLINK
SQLITE_CONSTRAINT_CHECK
SQLITE_CONSTRAINT_COMMITHOOK
SQLITE_CONSTRAINT_DATATYPE
SQLITE_CONSTRAINT_FOREIGNKEY
SQLITE_CONSTRAINT_FUNCTION
SQLITE_CONSTRAINT_NOTNULL
@ -103,6 +119,7 @@ our @EXPORT_OK = (
SQLITE_CONSTRAINT_TRIGGER
SQLITE_CONSTRAINT_UNIQUE
SQLITE_CONSTRAINT_VTAB
SQLITE_CORRUPT_INDEX
SQLITE_CORRUPT_SEQUENCE
SQLITE_CORRUPT_VTAB
SQLITE_ERROR_MISSING_COLLSEQ
@ -116,6 +133,8 @@ our @EXPORT_OK = (
SQLITE_IOERR_CLOSE
SQLITE_IOERR_COMMIT_ATOMIC
SQLITE_IOERR_CONVPATH
SQLITE_IOERR_CORRUPTFS
SQLITE_IOERR_DATA
SQLITE_IOERR_DELETE
SQLITE_IOERR_DELETE_NOENT
SQLITE_IOERR_DIR_CLOSE
@ -123,6 +142,7 @@ our @EXPORT_OK = (
SQLITE_IOERR_FSTAT
SQLITE_IOERR_FSYNC
SQLITE_IOERR_GETTEMPPATH
SQLITE_IOERR_IN_PAGE
SQLITE_IOERR_LOCK
SQLITE_IOERR_MMAP
SQLITE_IOERR_NOMEM
@ -141,6 +161,7 @@ our @EXPORT_OK = (
SQLITE_IOERR_WRITE
SQLITE_LOCKED_SHAREDCACHE
SQLITE_LOCKED_VTAB
SQLITE_NOTICE_RBU
SQLITE_NOTICE_RECOVER_ROLLBACK
SQLITE_NOTICE_RECOVER_WAL
SQLITE_OK_SYMLINK
@ -156,6 +177,7 @@ our @EXPORT_OK = (
# flags_for_file_open_operations
qw/
SQLITE_OPEN_CREATE
SQLITE_OPEN_EXRESCODE
SQLITE_OPEN_FULLMUTEX
SQLITE_OPEN_MEMORY
SQLITE_OPEN_NOFOLLOW
@ -164,6 +186,7 @@ our @EXPORT_OK = (
SQLITE_OPEN_READONLY
SQLITE_OPEN_READWRITE
SQLITE_OPEN_SHAREDCACHE
SQLITE_OPEN_SUPER_JOURNAL
SQLITE_OPEN_URI
/,
@ -172,6 +195,7 @@ our @EXPORT_OK = (
SQLITE_DETERMINISTIC
SQLITE_DIRECTONLY
SQLITE_INNOCUOUS
SQLITE_RESULT_SUBTYPE
SQLITE_SUBTYPE
/,
@ -181,6 +205,7 @@ our @EXPORT_OK = (
SQLITE_FLOAT
SQLITE_INTEGER
SQLITE_NULL
SQLITE_TEXT
/,
# result_codes
@ -249,6 +274,7 @@ our %EXPORT_TAGS = (
SQLITE_BUSY
SQLITE_BUSY_RECOVERY
SQLITE_BUSY_SNAPSHOT
SQLITE_BUSY_TIMEOUT
SQLITE_CANTOPEN
SQLITE_CANTOPEN_CONVPATH
SQLITE_CANTOPEN_DIRTYWAL
@ -259,6 +285,7 @@ our %EXPORT_TAGS = (
SQLITE_CONSTRAINT
SQLITE_CONSTRAINT_CHECK
SQLITE_CONSTRAINT_COMMITHOOK
SQLITE_CONSTRAINT_DATATYPE
SQLITE_CONSTRAINT_FOREIGNKEY
SQLITE_CONSTRAINT_FUNCTION
SQLITE_CONSTRAINT_NOTNULL
@ -270,6 +297,7 @@ our %EXPORT_TAGS = (
SQLITE_CONSTRAINT_VTAB
SQLITE_COPY
SQLITE_CORRUPT
SQLITE_CORRUPT_INDEX
SQLITE_CORRUPT_SEQUENCE
SQLITE_CORRUPT_VTAB
SQLITE_CREATE_INDEX
@ -297,9 +325,16 @@ our %EXPORT_TAGS = (
SQLITE_DBCONFIG_MAX
SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE
SQLITE_DBCONFIG_RESET_DATABASE
SQLITE_DBCONFIG_REVERSE_SCANORDER
SQLITE_DBCONFIG_STMT_SCANSTATUS
SQLITE_DBCONFIG_TRIGGER_EQP
SQLITE_DBCONFIG_TRUSTED_SCHEMA
SQLITE_DBCONFIG_WRITABLE_SCHEMA
DBD_SQLITE_STRING_MODE_BYTES
DBD_SQLITE_STRING_MODE_PV
DBD_SQLITE_STRING_MODE_UNICODE_FALLBACK
DBD_SQLITE_STRING_MODE_UNICODE_NAIVE
DBD_SQLITE_STRING_MODE_UNICODE_STRICT
SQLITE_DELETE
SQLITE_DENY
SQLITE_DETACH
@ -339,6 +374,8 @@ our %EXPORT_TAGS = (
SQLITE_IOERR_CLOSE
SQLITE_IOERR_COMMIT_ATOMIC
SQLITE_IOERR_CONVPATH
SQLITE_IOERR_CORRUPTFS
SQLITE_IOERR_DATA
SQLITE_IOERR_DELETE
SQLITE_IOERR_DELETE_NOENT
SQLITE_IOERR_DIR_CLOSE
@ -346,6 +383,7 @@ our %EXPORT_TAGS = (
SQLITE_IOERR_FSTAT
SQLITE_IOERR_FSYNC
SQLITE_IOERR_GETTEMPPATH
SQLITE_IOERR_IN_PAGE
SQLITE_IOERR_LOCK
SQLITE_IOERR_MMAP
SQLITE_IOERR_NOMEM
@ -384,12 +422,14 @@ our %EXPORT_TAGS = (
SQLITE_NOTADB
SQLITE_NOTFOUND
SQLITE_NOTICE
SQLITE_NOTICE_RBU
SQLITE_NOTICE_RECOVER_ROLLBACK
SQLITE_NOTICE_RECOVER_WAL
SQLITE_NULL
SQLITE_OK
SQLITE_OK_SYMLINK
SQLITE_OPEN_CREATE
SQLITE_OPEN_EXRESCODE
SQLITE_OPEN_FULLMUTEX
SQLITE_OPEN_MEMORY
SQLITE_OPEN_NOFOLLOW
@ -398,6 +438,7 @@ our %EXPORT_TAGS = (
SQLITE_OPEN_READONLY
SQLITE_OPEN_READWRITE
SQLITE_OPEN_SHAREDCACHE
SQLITE_OPEN_SUPER_JOURNAL
SQLITE_OPEN_URI
SQLITE_PERM
SQLITE_PRAGMA
@ -413,19 +454,30 @@ our %EXPORT_TAGS = (
SQLITE_READONLY_ROLLBACK
SQLITE_RECURSIVE
SQLITE_REINDEX
SQLITE_RESULT_SUBTYPE
SQLITE_ROW
SQLITE_SAVEPOINT
SQLITE_SCHEMA
SQLITE_SELECT
SQLITE_SUBTYPE
SQLITE_TEXT
SQLITE_TOOBIG
SQLITE_TRANSACTION
SQLITE_TXN_NONE
SQLITE_TXN_READ
SQLITE_TXN_WRITE
SQLITE_UPDATE
SQLITE_VERSION_NUMBER
SQLITE_WARNING
SQLITE_WARNING_AUTOINDEX
/],
allowed_return_values_from_sqlite3_txn_state => [qw/
SQLITE_TXN_NONE
SQLITE_TXN_READ
SQLITE_TXN_WRITE
/],
authorizer_action_codes => [qw/
SQLITE_ALTER_TABLE
SQLITE_ANALYZE
@ -489,16 +541,27 @@ our %EXPORT_TAGS = (
SQLITE_DBCONFIG_MAX
SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE
SQLITE_DBCONFIG_RESET_DATABASE
SQLITE_DBCONFIG_REVERSE_SCANORDER
SQLITE_DBCONFIG_STMT_SCANSTATUS
SQLITE_DBCONFIG_TRIGGER_EQP
SQLITE_DBCONFIG_TRUSTED_SCHEMA
SQLITE_DBCONFIG_WRITABLE_SCHEMA
/],
dbd_sqlite_string_mode => [qw/
DBD_SQLITE_STRING_MODE_BYTES
DBD_SQLITE_STRING_MODE_PV
DBD_SQLITE_STRING_MODE_UNICODE_FALLBACK
DBD_SQLITE_STRING_MODE_UNICODE_NAIVE
DBD_SQLITE_STRING_MODE_UNICODE_STRICT
/],
extended_result_codes => [qw/
SQLITE_ABORT_ROLLBACK
SQLITE_AUTH_USER
SQLITE_BUSY_RECOVERY
SQLITE_BUSY_SNAPSHOT
SQLITE_BUSY_TIMEOUT
SQLITE_CANTOPEN_CONVPATH
SQLITE_CANTOPEN_DIRTYWAL
SQLITE_CANTOPEN_FULLPATH
@ -507,6 +570,7 @@ our %EXPORT_TAGS = (
SQLITE_CANTOPEN_SYMLINK
SQLITE_CONSTRAINT_CHECK
SQLITE_CONSTRAINT_COMMITHOOK
SQLITE_CONSTRAINT_DATATYPE
SQLITE_CONSTRAINT_FOREIGNKEY
SQLITE_CONSTRAINT_FUNCTION
SQLITE_CONSTRAINT_NOTNULL
@ -516,6 +580,7 @@ our %EXPORT_TAGS = (
SQLITE_CONSTRAINT_TRIGGER
SQLITE_CONSTRAINT_UNIQUE
SQLITE_CONSTRAINT_VTAB
SQLITE_CORRUPT_INDEX
SQLITE_CORRUPT_SEQUENCE
SQLITE_CORRUPT_VTAB
SQLITE_ERROR_MISSING_COLLSEQ
@ -529,6 +594,8 @@ our %EXPORT_TAGS = (
SQLITE_IOERR_CLOSE
SQLITE_IOERR_COMMIT_ATOMIC
SQLITE_IOERR_CONVPATH
SQLITE_IOERR_CORRUPTFS
SQLITE_IOERR_DATA
SQLITE_IOERR_DELETE
SQLITE_IOERR_DELETE_NOENT
SQLITE_IOERR_DIR_CLOSE
@ -536,6 +603,7 @@ our %EXPORT_TAGS = (
SQLITE_IOERR_FSTAT
SQLITE_IOERR_FSYNC
SQLITE_IOERR_GETTEMPPATH
SQLITE_IOERR_IN_PAGE
SQLITE_IOERR_LOCK
SQLITE_IOERR_MMAP
SQLITE_IOERR_NOMEM
@ -554,6 +622,7 @@ our %EXPORT_TAGS = (
SQLITE_IOERR_WRITE
SQLITE_LOCKED_SHAREDCACHE
SQLITE_LOCKED_VTAB
SQLITE_NOTICE_RBU
SQLITE_NOTICE_RECOVER_ROLLBACK
SQLITE_NOTICE_RECOVER_WAL
SQLITE_OK_SYMLINK
@ -568,6 +637,7 @@ our %EXPORT_TAGS = (
flags_for_file_open_operations => [qw/
SQLITE_OPEN_CREATE
SQLITE_OPEN_EXRESCODE
SQLITE_OPEN_FULLMUTEX
SQLITE_OPEN_MEMORY
SQLITE_OPEN_NOFOLLOW
@ -576,6 +646,7 @@ our %EXPORT_TAGS = (
SQLITE_OPEN_READONLY
SQLITE_OPEN_READWRITE
SQLITE_OPEN_SHAREDCACHE
SQLITE_OPEN_SUPER_JOURNAL
SQLITE_OPEN_URI
/],
@ -583,6 +654,7 @@ our %EXPORT_TAGS = (
SQLITE_DETERMINISTIC
SQLITE_DIRECTONLY
SQLITE_INNOCUOUS
SQLITE_RESULT_SUBTYPE
SQLITE_SUBTYPE
/],
@ -591,6 +663,7 @@ our %EXPORT_TAGS = (
SQLITE_FLOAT
SQLITE_INTEGER
SQLITE_NULL
SQLITE_TEXT
/],
result_codes => [qw/
@ -663,12 +736,24 @@ DBD::SQLite::Constants - common SQLite constants
=head1 DESCRIPTION
You can import necessary SQLite constants from this module. Available tags are C<all>, C<authorizer_action_codes>, C<authorizer_return_codes>, C<version> (C<compile_time_library_version_numbers>), C<database_connection_configuration_options>, C<extended_result_codes>, C<file_open> (C<flags_for_file_open_operations>), C<function_flags>, C<datatypes> (C<fundamental_datatypes>), C<result_codes>, C<run_time_limit_categories>. See L<http://sqlite.org/c3ref/constlist.html> for the complete list of constants.
You can import necessary SQLite constants from this module. Available tags are C<all>, C<allowed_return_values_from_sqlite3_txn_state>, C<authorizer_action_codes>, C<authorizer_return_codes>, C<version> (C<compile_time_library_version_numbers>), C<database_connection_configuration_options>, C<dbd_sqlite_string_mode>, C<extended_result_codes>, C<file_open> (C<flags_for_file_open_operations>), C<function_flags>, C<datatypes> (C<fundamental_datatypes>), C<result_codes>, C<run_time_limit_categories>. See L<http://sqlite.org/c3ref/constlist.html> for the complete list of constants.
This module does not export anything by default.
=head1 CONSTANTS
=head2 allowed_return_values_from_sqlite3_txn_state
=over 4
=item SQLITE_TXN_NONE
=item SQLITE_TXN_READ
=item SQLITE_TXN_WRITE
=back
=head2 authorizer_action_codes
=over 4
@ -803,6 +888,26 @@ This module does not export anything by default.
=item SQLITE_DBCONFIG_TRUSTED_SCHEMA
=item SQLITE_DBCONFIG_STMT_SCANSTATUS
=item SQLITE_DBCONFIG_REVERSE_SCANORDER
=back
=head2 dbd_sqlite_string_mode
=over 4
=item DBD_SQLITE_STRING_MODE_PV
=item DBD_SQLITE_STRING_MODE_BYTES
=item DBD_SQLITE_STRING_MODE_UNICODE_NAIVE
=item DBD_SQLITE_STRING_MODE_UNICODE_FALLBACK
=item DBD_SQLITE_STRING_MODE_UNICODE_STRICT
=back
=head2 extended_result_codes
@ -947,6 +1052,20 @@ This module does not export anything by default.
=item SQLITE_OK_SYMLINK
=item SQLITE_IOERR_DATA
=item SQLITE_BUSY_TIMEOUT
=item SQLITE_CORRUPT_INDEX
=item SQLITE_IOERR_CORRUPTFS
=item SQLITE_CONSTRAINT_DATATYPE
=item SQLITE_NOTICE_RBU
=item SQLITE_IOERR_IN_PAGE
=back
=head2 file_open (flags_for_file_open_operations)
@ -973,6 +1092,10 @@ This module does not export anything by default.
=item SQLITE_OPEN_NOFOLLOW
=item SQLITE_OPEN_SUPER_JOURNAL
=item SQLITE_OPEN_EXRESCODE
=back
=head2 function_flags
@ -987,6 +1110,8 @@ This module does not export anything by default.
=item SQLITE_INNOCUOUS
=item SQLITE_RESULT_SUBTYPE
=back
=head2 datatypes (fundamental_datatypes)
@ -1001,6 +1126,8 @@ This module does not export anything by default.
=item SQLITE_NULL
=item SQLITE_TEXT
=back
=head2 result_codes

View file

@ -5,7 +5,7 @@ use strict;
use warnings;
use Scalar::Util qw/weaken/;
our $VERSION = '1.65_02';
our $VERSION = '1.76';
our @ISA;

86814
sqlite3.c

File diff suppressed because it is too large Load diff

3343
sqlite3.h

File diff suppressed because it is too large Load diff

View file

@ -330,6 +330,42 @@ struct sqlite3_api_routines {
const char *(*filename_database)(const char*);
const char *(*filename_journal)(const char*);
const char *(*filename_wal)(const char*);
/* Version 3.32.0 and later */
const char *(*create_filename)(const char*,const char*,const char*,
int,const char**);
void (*free_filename)(const char*);
sqlite3_file *(*database_file_object)(const char*);
/* Version 3.34.0 and later */
int (*txn_state)(sqlite3*,const char*);
/* Version 3.36.1 and later */
sqlite3_int64 (*changes64)(sqlite3*);
sqlite3_int64 (*total_changes64)(sqlite3*);
/* Version 3.37.0 and later */
int (*autovacuum_pages)(sqlite3*,
unsigned int(*)(void*,const char*,unsigned int,unsigned int,unsigned int),
void*, void(*)(void*));
/* Version 3.38.0 and later */
int (*error_offset)(sqlite3*);
int (*vtab_rhs_value)(sqlite3_index_info*,int,sqlite3_value**);
int (*vtab_distinct)(sqlite3_index_info*);
int (*vtab_in)(sqlite3_index_info*,int,int);
int (*vtab_in_first)(sqlite3_value*,sqlite3_value**);
int (*vtab_in_next)(sqlite3_value*,sqlite3_value**);
/* Version 3.39.0 and later */
int (*deserialize)(sqlite3*,const char*,unsigned char*,
sqlite3_int64,sqlite3_int64,unsigned);
unsigned char *(*serialize)(sqlite3*,const char *,sqlite3_int64*,
unsigned int);
const char *(*db_name)(sqlite3*,int);
/* Version 3.40.0 and later */
int (*value_encoding)(sqlite3_value*);
/* Version 3.41.0 and later */
int (*is_interrupted)(sqlite3*);
/* Version 3.43.0 and later */
int (*stmt_explain)(sqlite3_stmt*,int);
/* Version 3.44.0 and later */
void *(*get_clientdata)(sqlite3*,const char*);
int (*set_clientdata)(sqlite3*, const char*, void*, void(*)(void*));
};
/*
@ -630,6 +666,39 @@ typedef int (*sqlite3_loadext_entry)(
#define sqlite3_filename_database sqlite3_api->filename_database
#define sqlite3_filename_journal sqlite3_api->filename_journal
#define sqlite3_filename_wal sqlite3_api->filename_wal
/* Version 3.32.0 and later */
#define sqlite3_create_filename sqlite3_api->create_filename
#define sqlite3_free_filename sqlite3_api->free_filename
#define sqlite3_database_file_object sqlite3_api->database_file_object
/* Version 3.34.0 and later */
#define sqlite3_txn_state sqlite3_api->txn_state
/* Version 3.36.1 and later */
#define sqlite3_changes64 sqlite3_api->changes64
#define sqlite3_total_changes64 sqlite3_api->total_changes64
/* Version 3.37.0 and later */
#define sqlite3_autovacuum_pages sqlite3_api->autovacuum_pages
/* Version 3.38.0 and later */
#define sqlite3_error_offset sqlite3_api->error_offset
#define sqlite3_vtab_rhs_value sqlite3_api->vtab_rhs_value
#define sqlite3_vtab_distinct sqlite3_api->vtab_distinct
#define sqlite3_vtab_in sqlite3_api->vtab_in
#define sqlite3_vtab_in_first sqlite3_api->vtab_in_first
#define sqlite3_vtab_in_next sqlite3_api->vtab_in_next
/* Version 3.39.0 and later */
#ifndef SQLITE_OMIT_DESERIALIZE
#define sqlite3_deserialize sqlite3_api->deserialize
#define sqlite3_serialize sqlite3_api->serialize
#endif
#define sqlite3_db_name sqlite3_api->db_name
/* Version 3.40.0 and later */
#define sqlite3_value_encoding sqlite3_api->value_encoding
/* Version 3.41.0 and later */
#define sqlite3_is_interrupted sqlite3_api->is_interrupted
/* Version 3.43.0 and later */
#define sqlite3_stmt_explain sqlite3_api->stmt_explain
/* Version 3.44.0 and later */
#define sqlite3_get_clientdata sqlite3_api->get_clientdata
#define sqlite3_set_clientdata sqlite3_api->set_clientdata
#endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
#if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)

View file

@ -7,6 +7,10 @@ use SQLiteTest qw/connect_ok @CALL_FUNCS/;
use Test::More;
use if -d ".git", "Test::FailWarnings";
use DBD::SQLite::Constants ':dbd_sqlite_string_mode';
my $unicode_opt = DBD_SQLITE_STRING_MODE_UNICODE_STRICT;
my $show_diag = 0;
foreach my $call_func (@CALL_FUNCS) {
@ -30,9 +34,9 @@ foreach my $call_func (@CALL_FUNCS) {
skip( 'Unicode is not supported before 5.8.5', 2 );
}
my $file = 'foo'.$$;
my $dbh = DBI->connect( "dbi:SQLite:dbname=$file;sqlite_unicode=1", '', '' );
my $dbh = DBI->connect( "dbi:SQLite:dbname=$file;sqlite_string_mode=$unicode_opt", '', '' );
isa_ok( $dbh, 'DBI::db' );
is( $dbh->{sqlite_unicode}, 1, 'Unicode is on' );
is( $dbh->{sqlite_string_mode}, $unicode_opt, 'Unicode is on' );
$dbh->disconnect;
unlink $file;
}

View file

@ -25,4 +25,12 @@ ok($@, 'Statement 2 generated an error');
is( $DBI::err, 19, '$DBI::err ok' );
like( $DBI::errstr, qr/column a is not unique|UNIQUE constraint failed/, '$DBI::errstr ok' );
if ($DBD::SQLite::sqlite_version_number && $DBD::SQLite::sqlite_version_number >= 3038000) {
my $sql = 'insert testerror values (1, 5)';
eval { $dbh->do($sql) };
my $offset = $dbh->sqlite_error_offset;
ok $offset != -1, "error offset: $offset";
note substr($sql, 0, $offset) . '<*error*>' . substr($sql, $offset);
}
done_testing;

View file

@ -150,6 +150,10 @@ foreach my $call_func (@CALL_FUNCS) { for my $flags (@function_flags) {
$result = $dbh->selectrow_arrayref( "SELECT typeof(md5_blob('my_blob'))" );
is_deeply( $result, [ 'blob' ], "SELECT typeof(md5_blob('my_blob'))" );
ok($dbh->$call_func( "md5_blob", 1, undef, defined $flags ? $flags : (), "create_function" ));
$result = $dbh->selectrow_arrayref( "SELECT md5_blob('my_blob')" );
is_deeply( $result, undef, "SELECT md5_blob('my_blob')" );
$dbh->disconnect;
}}

View file

@ -8,6 +8,10 @@ use SQLiteTest;
use Test::More;
use if -d ".git", "Test::FailWarnings";
use DBD::SQLite::Constants ':dbd_sqlite_string_mode';
my $unicode_opt = DBD_SQLITE_STRING_MODE_UNICODE_STRICT;
BEGIN { requires_unicode_support() }
#
@ -51,7 +55,7 @@ ok(
my ($textback, $bytesback);
SCOPE: {
my $dbh = connect_ok( dbfile => 'foo', RaiseError => 1 );
is( $dbh->{sqlite_unicode}, 0, 'Unicode is off' );
is( $dbh->{sqlite_string_mode}, DBD::SQLite::Constants::DBD_SQLITE_STRING_MODE_PV, 'default string mode is pv' );
ok(
$dbh->do("CREATE TABLE table1 (a TEXT, b BLOB)"),
'CREATE TABLE',
@ -73,8 +77,8 @@ SCOPE: {
# Start over but now activate Unicode support.
SCOPE: {
my $dbh = connect_ok( dbfile => 'foo', sqlite_unicode => 1 );
is( $dbh->{sqlite_unicode}, 1, 'Unicode is on' );
my $dbh = connect_ok( dbfile => 'foo', sqlite_string_mode => $unicode_opt );
is( $dbh->{sqlite_string_mode}, $unicode_opt, 'Unicode is on' );
($textback, $bytesback) = database_roundtrip($dbh, $utfstring, $bytestring);

View file

@ -7,6 +7,9 @@ use Test::More;
use if -d ".git", "Test::FailWarnings";
use Encode qw/decode/;
use DBD::SQLite;
use DBD::SQLite::Constants ':dbd_sqlite_string_mode';
my $unicode_opt = DBD_SQLITE_STRING_MODE_UNICODE_STRICT;
BEGIN { requires_unicode_support(); }
@ -71,10 +74,10 @@ is($DBD::SQLite::COLLATION{foo}, \&by_num_desc, "overridden collation");
foreach my $call_func (@CALL_FUNCS) {
for my $use_unicode (0, 1) {
for my $unicode_opt (DBD_SQLITE_STRING_MODE_BYTES, DBD_SQLITE_STRING_MODE_UNICODE_STRICT) {
# connect
my $dbh = connect_ok( RaiseError => 1, sqlite_unicode => $use_unicode );
my $dbh = connect_ok( RaiseError => 1, sqlite_string_mode => $unicode_opt );
# populate test data
my @words = qw{
@ -84,7 +87,7 @@ foreach my $call_func (@CALL_FUNCS) {
HAT hâôer
féôu fêôe fèöe ferme
};
if ($use_unicode) {
if ($unicode_opt != DBD_SQLITE_STRING_MODE_BYTES) {
utf8::upgrade($_) foreach @words;
}

View file

@ -10,6 +10,10 @@ use if -d ".git", "Test::FailWarnings";
use File::Temp ();
use File::Spec::Functions ':ALL';
use DBD::SQLite::Constants ':dbd_sqlite_string_mode';
my $unicode_opt = DBD_SQLITE_STRING_MODE_UNICODE_STRICT;
BEGIN { requires_unicode_support() }
my $dir = File::Temp::tempdir( CLEANUP => 1 );
@ -55,7 +59,7 @@ foreach my $subdir ( 'longascii', 'adatb
my $dbh = DBI->connect("dbi:SQLite:dbname=$dbfile", undef, undef, {
RaiseError => 1,
PrintError => 0,
sqlite_unicode => 1,
sqlite_string_mode => $unicode_opt,
} );
isa_ok( $dbh, 'DBI::db' );
};
@ -67,7 +71,7 @@ foreach my $subdir ( 'longascii', 'adatb
my $dbh = DBI->connect("dbi:SQLite:dbname=$dbfile", undef, undef, {
RaiseError => 1,
PrintError => 0,
sqlite_unicode => 1,
sqlite_string_mode => $unicode_opt,
} );
isa_ok( $dbh, 'DBI::db' );
};

View file

@ -28,13 +28,14 @@ BEGIN {
use locale;
use DBD::SQLite;
use DBD::SQLite::Constants ':dbd_sqlite_string_mode';
foreach my $call_func (@CALL_FUNCS) {
for my $use_unicode (0, 1) {
for my $string_mode (DBD_SQLITE_STRING_MODE_BYTES, DBD_SQLITE_STRING_MODE_UNICODE_STRICT) {
# connect
my $dbh = connect_ok( RaiseError => 1, sqlite_unicode => $use_unicode );
my $dbh = connect_ok( RaiseError => 1, sqlite_string_mode => $string_mode );
# The following tests are about ordering, so don't reverse!
if ($dbh->selectrow_array('PRAGMA reverse_unordered_selects')) {
@ -43,7 +44,7 @@ foreach my $call_func (@CALL_FUNCS) {
# populate test data
my @vals = @words;
if ($use_unicode) {
if ($string_mode == DBD_SQLITE_STRING_MODE_BYTES) {
utf8::upgrade($_) foreach @vals;
}

View file

@ -1,11 +1,15 @@
use strict;
use warnings;
no if $] >= 5.022, "warnings", "locale";
use lib "t/lib";
use Time::HiRes qw/time/;
use SQLiteTest;
use Test::More;
use if -d ".git", "Test::FailWarnings";
use DBD::SQLite;
use DBD::SQLite::Constants ':dbd_sqlite_string_mode';
# Avoid slowdown with -DDEBUGGING:
${^UTF8CACHE} = 1;
my @texts = ("il était une bergère",
"qui gardait ses moutons",
@ -24,6 +28,9 @@ my @tests = (
["(il OR elle) AND un*" => 0, 2 ],
);
my $ix_une_native = index($texts[0], "une");
my $ix_une_utf8 = do {use bytes; utf8::upgrade(my $bergere_utf8 = $texts[0]); index($bergere_utf8, "une");};
BEGIN {
requires_unicode_support();
@ -35,31 +42,19 @@ BEGIN {
}
}
# Perl may spit a warning on locale
# use Test::NoWarnings;
BEGIN {
# Sadly perl for windows (and probably sqlite, too) may hang
# if the system locale doesn't support european languages.
# en-us should be a safe default. if it doesn't work, use 'C'.
if ( $^O eq 'MSWin32') {
use POSIX 'locale_h';
setlocale(LC_COLLATE, 'en-us');
}
}
use locale;
sub locale_tokenizer { # see also: Search::Tokenizer
sub Unicode_Word_tokenizer { # see also: Search::Tokenizer
return sub {
my $string = shift;
my $regex = qr/\w+/;
my $string = shift;
my $regex = qr/\p{Word}+/;
my $term_index = 0;
return sub {
$string =~ /$regex/g or return; # either match, or no more token
my ($start, $end) = ($-[0], $+[0]);
my $term = substr($string, $start, my $len = $end-$start);
my $term = $&;
my $end = pos $string; # $+[0] is much slower
my $len = length($term);
my $start = $end - $len;
return ($term, $len, $start, $end, $term_index++);
};
};
@ -67,10 +62,10 @@ sub locale_tokenizer { # see also: Search::Tokenizer
use DBD::SQLite;
for my $use_unicode (0, 1) {
for my $string_mode (DBD_SQLITE_STRING_MODE_BYTES, DBD_SQLITE_STRING_MODE_UNICODE_STRICT) {
# connect
my $dbh = connect_ok( RaiseError => 1, sqlite_unicode => $use_unicode );
my $dbh = connect_ok( RaiseError => 1, sqlite_string_mode => $string_mode );
for my $fts (qw/fts3 fts4/) {
next if $fts eq 'fts4' && !has_sqlite('3.7.4');
@ -78,7 +73,7 @@ for my $use_unicode (0, 1) {
# create fts table
$dbh->do(<<"") or die DBI::errstr;
CREATE VIRTUAL TABLE try_$fts
USING $fts(content, tokenize=perl 'main::locale_tokenizer')
USING $fts(content, tokenize=perl 'main::Unicode_Word_tokenizer')
# populate it
my $insert_sth = $dbh->prepare(<<"") or die DBI::errstr;
@ -102,9 +97,43 @@ for my $use_unicode (0, 1) {
my ($query, @expected) = @$t;
@expected = map {$doc_ids[$_]} @expected;
my $results = $dbh->selectcol_arrayref($sql, undef, $query);
is_deeply($results, \@expected, "$query ($fts, unicode=$use_unicode)");
is_deeply($results, \@expected, "$query ($fts, string_mode=$string_mode)");
}
}
# the 'snippet' function should highlight the words in the MATCH query
my $sql_snip = "SELECT snippet(try_$fts) FROM try_$fts WHERE content MATCH ?";
my $result = $dbh->selectcol_arrayref($sql_snip, undef, 'une');
is_deeply($result, ['il était <b>une</b> bergère'], "snippet ($fts, string_mode=$string_mode)");
# the 'offsets' function should return integer offsets for the words in the MATCH query
my $sql_offsets = "SELECT offsets(try_$fts) FROM try_$fts WHERE content MATCH ?";
$result = $dbh->selectcol_arrayref($sql_offsets, undef, 'une');
my $offset_une = $string_mode == DBD_SQLITE_STRING_MODE_UNICODE_STRICT ? $ix_une_utf8 : $ix_une_native;
my $expected_offsets = "0 0 $offset_une 3";
is_deeply($result, [$expected_offsets], "offsets ($fts, string_mode=$string_mode)");
# test snippet() on a longer sentence
$insert_sth->execute(join " ", @texts);
$result = $dbh->selectcol_arrayref($sql_snip, undef, '"bergère qui gardait"');
like($result->[0],
qr[une <b>bergère</b> <b>qui</b> <b>gardait</b> ses],
"longer snippet ($fts, string_mode=$string_mode)");
# simulated large document
open my $fh, "<", $INC{'DBD/SQLite.pm'} or die $!;
my $source_code = do {local $/; <$fh>};
my $long_doc = $source_code x 5;
my $t0 = time;
$insert_sth->execute($long_doc);
my $t1 = time;
$result = $dbh->selectcol_arrayref($sql_snip, undef, '"package DBD::SQLite"');
my $t2 = time;
note sprintf("long doc (%d chars): insert in %.4f secs, select in %.4f secs",
length($long_doc), $t1-$t0, $t2-$t1);
like($result->[0], qr[^<b>package</b> <b>DBD</b>::<b>SQLite</b>;], 'snippet "package SQLite"');
}
}

View file

@ -7,6 +7,8 @@ use Test::More;
BEGIN { requires_unicode_support() }
use DBD::SQLite::Constants ':dbd_sqlite_string_mode';
# special case for multibyte (non-ASCII) character class,
# which only works correctly under the unicode mode
my @words = ("\x{e3}\x{83}\x{86}\x{e3}\x{82}\x{b9}\x{e3}\x{83}\x{88}", "\x{e3}\x{83}\x{86}\x{e3}\x{83}\x{b3}\x{e3}\x{83}\x{88}"); # テスト テント
@ -15,15 +17,15 @@ my $regex = "\x{e3}\x{83}\x{86}[\x{e3}\x{82}\x{b9}\x{e3}\x{83}\x{b3}]\x{e3}\x{83
foreach my $call_func (@CALL_FUNCS) {
for my $use_unicode (0, 1) {
for my $string_mode (DBD_SQLITE_STRING_MODE_PV, DBD_SQLITE_STRING_MODE_UNICODE_STRICT) {
# connect
my $dbh = connect_ok( RaiseError => 1, sqlite_unicode => $use_unicode );
my $dbh = connect_ok( RaiseError => 1, sqlite_string_mode => $string_mode );
# populate test data
my @vals = @words;
my $re = $regex;
if ($use_unicode) {
if ($string_mode == DBD_SQLITE_STRING_MODE_UNICODE_STRICT) {
utf8::decode($_) foreach @vals;
utf8::decode($re);
}

41
t/67_txn_state.t Normal file
View file

@ -0,0 +1,41 @@
use strict;
use warnings;
use lib "t/lib";
use SQLiteTest qw/connect_ok @CALL_FUNCS/;
use Test::More;
use if -d ".git", "Test::FailWarnings";
use DBD::SQLite::Constants ':allowed_return_values_from_sqlite3_txn_state';
note "test main schema";
test('main');
note "test undef schema";
test(undef);
note "omit schema";
test();
done_testing;
sub test {
my @schema = @_;
die if @schema > 1;
for my $func (@CALL_FUNCS) {
my $dbh = connect_ok(PrintError => 0, RaiseError => 1);
$dbh->do('create table foo (id)');
my $txn_state = $dbh->$func(@schema, 'txn_state');
is $txn_state => SQLITE_TXN_NONE, "internal transaction is none";
$dbh->do('BEGIN');
my $row = $dbh->selectrow_arrayref('SELECT * FROM foo');
$txn_state = $dbh->$func(@schema, 'txn_state');
is $txn_state => SQLITE_TXN_READ, "internal transaction is read";
$dbh->do('insert into foo values (1)');
$txn_state = $dbh->$func(@schema, 'txn_state');
is $txn_state => SQLITE_TXN_WRITE, "internal transaction is write";
$dbh->commit;
}
}

View file

@ -0,0 +1,63 @@
# This is a test for correct handling of upgraded strings without
# the sqlite_unicode parameter.
use strict;
use warnings;
use lib "t/lib";
use SQLiteTest;
use DBD::SQLite::Constants;
use Test::More;
use if -d ".git", "Test::FailWarnings";
{
my $dbh = connect_ok( dbfile => 'foo', RaiseError => 1 );
$dbh->{sqlite_string_mode} = DBD::SQLite::Constants::DBD_SQLITE_STRING_MODE_BYTES;
my $tbl_name = "\xe9p\xe9e";
utf8::encode $tbl_name;
my $str = "CREATE TABLE $tbl_name ( col1 TEXT )";
utf8::upgrade $str;
$dbh->do($str);
my $master_ar = $dbh->selectall_arrayref('SELECT * FROM sqlite_master', { Slice => {} });
is(
$master_ar->[0]{'name'},
$tbl_name,
'do() takes correct string value',
);
#----------------------------------------------------------------------
my $dummy_str = "SELECT '$tbl_name'";
utf8::upgrade $dummy_str;
my $sth = $dbh->prepare($dummy_str);
$sth->execute();
my $row = $sth->fetchrow_arrayref();
is(
$row->[0],
$tbl_name,
'prepare() takes correct string value',
);
#----------------------------------------------------------------------
my $tbl_name_ug = $tbl_name;
utf8::upgrade $tbl_name_ug;
my $sth2 = $dbh->prepare('SELECT ?');
$sth2->execute( do { my $v = $tbl_name_ug } );
$row = $sth2->fetchrow_arrayref();
is(
$row->[0],
$tbl_name,
'execute() takes correct string value',
);
}
done_testing;

View file

@ -5,10 +5,14 @@ use SQLiteTest;
use Test::More;
use if -d ".git", "Test::FailWarnings";
use DBD::SQLite::Constants ':dbd_sqlite_string_mode';
my $unicode_opt = DBD_SQLITE_STRING_MODE_UNICODE_STRICT;
BEGIN { requires_unicode_support(); }
my $dbh = connect_ok( sqlite_unicode => 1 );
is( $dbh->{sqlite_unicode}, 1, 'Unicode is on' );
my $dbh = connect_ok( sqlite_string_mode => $unicode_opt );
is( $dbh->{sqlite_string_mode}, $unicode_opt, 'string mode is unicode/strict' );
ok( $dbh->do(<<'END_SQL'), 'CREATE TABLE' );
CREATE TABLE foo (

View file

@ -5,10 +5,14 @@ use SQLiteTest;
use Test::More;
use if -d ".git", "Test::FailWarnings";
use DBD::SQLite::Constants ':dbd_sqlite_string_mode';
my $unicode_opt = DBD_SQLITE_STRING_MODE_UNICODE_STRICT;
BEGIN { requires_unicode_support() }
foreach my $call_func (@CALL_FUNCS) {
my $dbh = connect_ok( sqlite_unicode => 1 );
my $dbh = connect_ok( sqlite_string_mode => $unicode_opt );
ok($dbh->$call_func( "perl_uc", 1, \&perl_uc, "create_function" ));
ok( $dbh->do(<<'END_SQL'), 'CREATE TABLE' );

View file

@ -6,9 +6,11 @@ use Test::More;
use if -d ".git", "Test::FailWarnings";
use DBI qw/:sql_types/;
use DBD::SQLite::Constants ':dbd_sqlite_string_mode';
BEGIN{ requires_unicode_support(); }
my $dbh = connect_ok(sqlite_unicode => 1);
my $dbh = connect_ok(sqlite_string_mode => DBD_SQLITE_STRING_MODE_UNICODE_STRICT);
$dbh->do('create table test1 (id integer, b blob)');
my $blob = "\x{82}\x{A0}";

View file

@ -8,7 +8,7 @@ use if -d ".git", "Test::FailWarnings";
my $dbh = connect_ok(sqlite_see_if_its_a_number => 1);
$dbh->do('create table foo (id integer primary key, exp)');
my $ct = 0;
for my $value (qw/2e100 10.04e100/) {
for my $value (qw/2e1000 10.04e1000/) {
eval {
$dbh->do('insert into foo values (?, ?)', undef, $ct++, $value);
my $got = $dbh->selectrow_arrayref('select * from foo where exp = ?', undef, $value);

View file

@ -6,6 +6,8 @@ use Test::More;
use if -d ".git", "Test::FailWarnings";
use Encode;
use DBD::SQLite::Constants ':dbd_sqlite_string_mode';
BEGIN { requires_unicode_support() }
unicode_test("\x{263A}"); # (decoded) smiley character
@ -20,7 +22,7 @@ sub unicode_test {
{ # tests for an environment where everything is encoded
my $dbh = connect_ok(sqlite_unicode => 0);
my $dbh = connect_ok(sqlite_string_mode => DBD_SQLITE_STRING_MODE_BYTES);
$dbh->do("pragma foreign_keys = on");
my $unicode_quoted = $dbh->quote_identifier($unicode_encoded);
$dbh->do("create table $unicode_quoted (id, $unicode_quoted primary key)");
@ -87,7 +89,7 @@ sub unicode_test {
}
{ # tests for an environment where everything is decoded
my $dbh = connect_ok(sqlite_unicode => 1);
my $dbh = connect_ok(sqlite_string_mode => DBD_SQLITE_STRING_MODE_UNICODE_STRICT);
$dbh->do("pragma foreign_keys = on");
my $unicode_quoted = $dbh->quote_identifier($unicode);
$dbh->do("create table $unicode_quoted (id, $unicode_quoted primary key)");

View file

@ -11,8 +11,10 @@ use if -d ".git", "Test::FailWarnings";
BEGIN { requires_unicode_support() }
my $dbh = connect_ok( sqlite_unicode => 1 );
is( $dbh->{sqlite_unicode}, 1, 'Unicode is on' );
use DBD::SQLite::Constants ':dbd_sqlite_string_mode';
my $dbh = connect_ok( sqlite_string_mode => DBD_SQLITE_STRING_MODE_UNICODE_NAIVE );
is( $dbh->{sqlite_string_mode}, DBD_SQLITE_STRING_MODE_UNICODE_NAIVE, 'Unicode is on' );
ok( $dbh->do(<<'END_SQL'), 'CREATE TABLE' );
CREATE TABLE foo (

View file

@ -176,6 +176,22 @@ my %since = (
OK_SYMLINK => '3031000',
OPEN_NOFOLLOW => '3031000',
INNOCUOUS => '3031000',
IOERR_DATA => '3032000',
BUSY_TIMEOUT => '3032000',
CORRUPT_INDEX => '3032000',
OPEN_SUPER_JOURNAL => '3033000',
TXN_NONE => '3034000',
TXN_READ => '3034000',
TXN_WRITE => '3034000',
IOERR_CORRUPTFS => '3034000',
SESSION_OBJCONFIG_SIZE => '3036000',
CONSTRAINT_DATATYPE => '3037000',
OPEN_EXRESCODE => '3037000',
NOTICE_RBU => '3041000',
DBCONFIG_STMT_SCANSTATUS => '3042000',
DBCONFIG_REVERSE_SCANORDER => '3042000',
IOERR_IN_PAGE => '3043000',
RESULT_SUBTYPE => '3044001',
status_parameters_for_prepared_statements => '3006004',
extended_result_codes => '3006005',
@ -190,6 +206,7 @@ my %since = (
checkpoint_mode_values => '3008008',
prepared_statement_scan_status_opcodes => '3008008',
sql_trace_event_codes => '3014000',
allowed_return_values_from_sqlite3_txn_state => '3034000',
);
my %until = (
@ -205,6 +222,7 @@ my %ignore = map {$_ => 1} qw/
OPEN_MAIN_JOURNAL OPEN_TEMP_JOURNAL
OPEN_SUBJOURNAL OPEN_MASTER_JOURNAL OPEN_WAL
OK_LOAD_PERMANENTLY PREPARE_PERSISTENT
SESSION_OBJCONFIG_SIZE
/;
my $ignore_tag_re = join '|', (
@ -219,6 +237,9 @@ my $ignore_tag_re = join '|', (
'virtual_table_configuration_options', # for sqlite3_vtab_config
'prepare_flags', # for sqlite3_prepare_v3
'delete_a_session_object',
'prepared_statement_scan_status',
# status flags (status methods are read-only at the moment)
'status_parameters',
'status_parameters_for_database_connections',
@ -244,6 +265,7 @@ my $ignore_tag_re = join '|', (
'text_encodings',
'virtual_table_constraint_operator_codes',
'virtual_table_indexing_information',
'options_for_sqlite3session_object_config',
);
my %compat = map {$_ => 1} qw/
@ -264,6 +286,7 @@ sub extract_constants {
if (/^\*\* CAPI3REF: (.+)/) {
$tag = lc $1;
$tag =~ s/[ \-]+/_/g;
$tag =~ s/[\[\]]//g;
($tag) = $tag =~ /^(\w+)/;
$tag =~ s/_$//;
if ($tag =~ /^($ignore_tag_re)/) {
@ -272,7 +295,7 @@ sub extract_constants {
}
next;
}
if ($tag && /^#define SQLITE_(\S+)\s+(\d+|\(SQLITE)/) {
if ($tag && /^#\s*define SQLITE_(\S+)\s+(\d+|\(SQLITE)/) {
my ($name, $value) = ($1, $2);
if ($name eq 'VERSION_NUMBER' and $value =~ /^\d+$/) {
$known_versions{$value} = 1;
@ -295,7 +318,7 @@ sub extract_constants {
my %bad_dist = map {$_ => 1} qw/3061601 3120000 3090300 3120100 3180100/;
sub versions {
my $res = HTTP::Tiny->new->get("http://sqlite.org/changes.html");
my $res = HTTP::Tiny->new->get("https://sqlite.org/changes.html");
reverse grep {$_->as_num >= 3060100 && !$bad_dist{$_->as_num}} map {s/_/./g; SQLiteUtil::Version->new($_)} $res->{content} =~ /name="version_(3_[\d_]+)"/g;
}
@ -455,6 +478,10 @@ sub year {
my $self = shift;
return "snapshot" if $self->is_snapshot;
my $version = $self->as_num;
return 2024 if $version >= 3450000;
return 2023 if $version >= 3410000;
return 2022 if $version >= 3370200;
return 2021 if $version >= 3340100;
return 2020 if $version >= 3310000;
return 2019 if $version >= 3270000;
return 2018 if $version >= 3220000;

View file

@ -17,6 +17,14 @@ my %shorter_tags = (
compile_time_library_version_numbers => 'version',
);
my @dbd_sqlite_constants = (
'DBD_SQLITE_STRING_MODE_PV',
'DBD_SQLITE_STRING_MODE_BYTES',
'DBD_SQLITE_STRING_MODE_UNICODE_NAIVE',
'DBD_SQLITE_STRING_MODE_UNICODE_FALLBACK',
'DBD_SQLITE_STRING_MODE_UNICODE_STRICT',
);
my %constants = extract_constants();
write_inc(%constants);
write_pm(%constants);
@ -34,8 +42,14 @@ MODULE = DBD::SQLite PACKAGE = DBD::SQLite::Constants
PROTOTYPES: ENABLE
BOOT:
END
for my $constsub (@dbd_sqlite_constants) {
print {$fh} qq< newCONSTSUB( gv_stashpv("DBD::SQLite::Constants", FALSE), "$constsub", newSVuv($constsub) );\n>
}
print $fh "\n";
for my $tag (sort grep !/^_/, keys %constants) {
_write_tag($fh, $tag, $constants{$tag});
}
@ -144,6 +158,10 @@ use DBD::SQLite;
our \@EXPORT_OK = (
END
for my $const (@dbd_sqlite_constants) {
print {$fh} " '$const',\n";
}
for my $tag (sort keys %constants) {
print $fh <<"END";
# $tag
@ -171,11 +189,14 @@ END
my %seen;
$constants{all} = [sort grep {!$seen{$_}++} map {@$_} values %constants];
push @{$constants{all}}, @dbd_sqlite_constants;
$constants{dbd_sqlite_string_mode} = [grep /^DBD_SQLITE_STRING_MODE_/, @dbd_sqlite_constants];
my $sp = ' ' x 6;
for my $tag (sort keys %constants) {
print $fh <<"END";
$tag => [qw/
@{[join "\n", map {" SQLITE_$_"} sort @{$constants{$tag}}]}
@{[join "\n", map { /^DBD_SQLITE_/ ? "$sp$_" : "${sp}SQLITE_$_"} sort @{$constants{$tag}}]}
/],
END
@ -226,10 +247,17 @@ END
END
for my $const (@{$constants{$tag}}) {
print $fh <<"END";
if ($const =~ /^DBD_SQLITE_/) {
print $fh <<"END";
\=item $const
END
} else {
print $fh <<"END";
\=item SQLITE_$const
END
}
}
print $fh <<"END";
\=back