simcop2387/DBD-SQLite-SQLcipher
1
0
Fork 0
mirror of https://github.com/DBD-SQLite/DBD-SQLite synced 2025-06-07 22:28:47 -04:00
Code Issues Releases Wiki Activity

make sure to set internal unicode mode before registering default callbacks (REGEXP function etc)

Browse source
This commit is contained in:
Kenichi Ishigaki 2016-02-20 09:45:11 +09:00
parent 20f57e8eb0
commit 7ae3f655d0
2 changed files with 66 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
dbdimp.c
View file

@ -405,6 +405,7 @@ sqlite_db_login6(SV *dbh, imp_dbh_t *imp_dbh, char *dbname, char *user, char *pa
SV **val; SV **val;
int extended = 0; int extended = 0;
int flag = 0; int flag = 0;
int unicode = 0;
sqlite_trace(dbh, imp_dbh, 3, form("login '%s' (version %s)", dbname, sqlite3_version)); sqlite_trace(dbh, imp_dbh, 3, form("login '%s' (version %s)", dbname, sqlite3_version));
@ -427,6 +428,14 @@ sqlite_db_login6(SV *dbh, imp_dbh_t *imp_dbh, char *dbname, char *user, char *pa
hv_stores(hv, "ReadOnly", newSViv(1)); hv_stores(hv, "ReadOnly", newSViv(1));
} }
} }
/* sqlite_unicode should be detected earlier, to register default functions correctly */
if (hv_exists(hv, "sqlite_unicode", 14)) {
val = hv_fetch(hv, "sqlite_unicode", 14, 0);
unicode = (val && SvOK(*val)) ? SvIV(*val) : 0;
} else if (hv_exists(hv, "unicode", 7)) {
val = hv_fetch(hv, "unicode", 7, 0);
unicode = (val && SvOK(*val)) ? SvIV(*val) : 0;
}
} }
rc = sqlite_open2(dbname, &(imp_dbh->db), flag, extended); rc = sqlite_open2(dbname, &(imp_dbh->db), flag, extended);
if ( rc != SQLITE_OK ) { if ( rc != SQLITE_OK ) {
@ -434,7 +443,7 @@ sqlite_db_login6(SV *dbh, imp_dbh_t *imp_dbh, char *dbname, char *user, char *pa
} }
DBIc_IMPSET_on(imp_dbh); DBIc_IMPSET_on(imp_dbh);
imp_dbh->unicode = FALSE; imp_dbh->unicode = unicode;
imp_dbh->functions = newAV(); imp_dbh->functions = newAV();
imp_dbh->aggregates = newAV(); imp_dbh->aggregates = newAV();
imp_dbh->collation_needed_callback = newSVsv( &PL_sv_undef ); imp_dbh->collation_needed_callback = newSVsv( &PL_sv_undef );

56
t/62_regexp_multibyte_char_class.t Normal file
View file

@ -0,0 +1,56 @@
#!/usr/bin/perl
use strict;
BEGIN {
$| = 1;
$^W = 1;
}
use t::lib::Test qw/connect_ok @CALL_FUNCS/;
use Test::More;
BEGIN {
if ($] < 5.008005) {
plan skip_all => 'Unicode is not supported before 5.8.5';
}
}
use Test::NoWarnings;
# special case for multibyte (non-ASCII) character class,
# which only works correctly under the unicode mode
my @words = qw{ テスト テント };
my $regex = 'テ[スン]ト';
plan tests => 2 * 2 * @CALL_FUNCS + 1;
foreach my $call_func (@CALL_FUNCS) {
for my $use_unicode (0, 1) {
# connect
my $dbh = connect_ok( RaiseError => 1, sqlite_unicode => $use_unicode );
# populate test data
my @vals = @words;
my $re = $regex;
if ($use_unicode) {
utf8::decode($_) foreach @vals;
utf8::decode($re);
}
$dbh->do( 'CREATE TEMP TABLE regexp_test ( txt )' );
$dbh->do( "INSERT INTO regexp_test VALUES ( '$_' )" ) foreach @vals;
my $sql = "SELECT txt from regexp_test WHERE txt REGEXP '$re' ";
my $db_match = $dbh->selectcol_arrayref($sql);
if ($use_unicode) {
is @$db_match => 2;
note explain $db_match;
} else {
is @$db_match => 0;
note explain $db_match;
}
}
}