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

fix GH #8

Browse source
This commit is contained in:
Kenichi Ishigaki 2015-04-16 19:59:21 +09:00
parent eaf3dc37d0
commit a23de06650
5 changed files with 45 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
SQLite.xs
View file

@ -44,16 +44,17 @@ last_insert_rowid(dbh)
RETVAL RETVAL
static int static int
create_function(dbh, name, argc, func) create_function(dbh, name, argc, func, flags = 0)
SV *dbh SV *dbh
char *name char *name
int argc int argc
SV *func SV *func
int flags
ALIAS: ALIAS:
DBD::SQLite::db::sqlite_create_function = 1 DBD::SQLite::db::sqlite_create_function = 1
CODE: CODE:
{ {
RETVAL = sqlite_db_create_function(aTHX_ dbh, name, argc, func ); RETVAL = sqlite_db_create_function(aTHX_ dbh, name, argc, func, flags );
} }
OUTPUT: OUTPUT:
RETVAL RETVAL
@ -90,16 +91,17 @@ load_extension(dbh, file, proc = 0)
#endif #endif
static int static int
create_aggregate(dbh, name, argc, aggr) create_aggregate(dbh, name, argc, aggr, flags = 0)
SV *dbh SV *dbh
char *name char *name
int argc int argc
SV *aggr SV *aggr
int flags
ALIAS: ALIAS:
DBD::SQLite::db::sqlite_create_aggregate = 1 DBD::SQLite::db::sqlite_create_aggregate = 1
CODE: CODE:
{ {
RETVAL = sqlite_db_create_aggregate(aTHX_ dbh, name, argc, aggr ); RETVAL = sqlite_db_create_aggregate(aTHX_ dbh, name, argc, aggr, flags );
} }
OUTPUT: OUTPUT:
RETVAL RETVAL

8
dbdimp.c
View file

@ -1698,7 +1698,7 @@ sqlite_db_func_dispatcher_no_unicode(sqlite3_context *context, int argc, sqlite3
} }
int int
sqlite_db_create_function(pTHX_ SV *dbh, const char *name, int argc, SV *func) sqlite_db_create_function(pTHX_ SV *dbh, const char *name, int argc, SV *func, int flags)
{ {
D_imp_dbh(dbh); D_imp_dbh(dbh);
int rc; int rc;
@ -1716,7 +1716,7 @@ sqlite_db_create_function(pTHX_ SV *dbh, const char *name, int argc, SV *func)
croak_if_db_is_null(); croak_if_db_is_null();
/* warn("create_function %s with %d args\n", name, argc); */ /* warn("create_function %s with %d args\n", name, argc); */
rc = sqlite3_create_function( imp_dbh->db, name, argc, SQLITE_UTF8, rc = sqlite3_create_function( imp_dbh->db, name, argc, SQLITE_UTF8|flags,
func_sv, func_sv,
imp_dbh->unicode ? sqlite_db_func_dispatcher_unicode imp_dbh->unicode ? sqlite_db_func_dispatcher_unicode
: sqlite_db_func_dispatcher_no_unicode, : sqlite_db_func_dispatcher_no_unicode,
@ -1991,7 +1991,7 @@ sqlite_db_aggr_finalize_dispatcher( sqlite3_context *context )
} }
int int
sqlite_db_create_aggregate(pTHX_ SV *dbh, const char *name, int argc, SV *aggr_pkg) sqlite_db_create_aggregate(pTHX_ SV *dbh, const char *name, int argc, SV *aggr_pkg, int flags)
{ {
D_imp_dbh(dbh); D_imp_dbh(dbh);
int rc; int rc;
@ -2008,7 +2008,7 @@ sqlite_db_create_aggregate(pTHX_ SV *dbh, const char *name, int argc, SV *aggr_p
croak_if_db_is_null(); croak_if_db_is_null();
rc = sqlite3_create_function( imp_dbh->db, name, argc, SQLITE_UTF8, rc = sqlite3_create_function( imp_dbh->db, name, argc, SQLITE_UTF8|flags,
aggr_pkg_copy, aggr_pkg_copy,
NULL, NULL,
sqlite_db_aggr_step_dispatcher, sqlite_db_aggr_step_dispatcher,

4
dbdimp.h
View file

@ -95,14 +95,14 @@ struct aggrInfo {
}; };
int sqlite_db_create_function(pTHX_ SV *dbh, const char *name, int argc, SV *func); int sqlite_db_create_function(pTHX_ SV *dbh, const char *name, int argc, SV *func, int flags);
#ifndef SQLITE_OMIT_LOAD_EXTENSION #ifndef SQLITE_OMIT_LOAD_EXTENSION
int sqlite_db_enable_load_extension(pTHX_ SV *dbh, int onoff); int sqlite_db_enable_load_extension(pTHX_ SV *dbh, int onoff);
int sqlite_db_load_extension(pTHX_ SV *dbh, const char *file, const char *proc); int sqlite_db_load_extension(pTHX_ SV *dbh, const char *file, const char *proc);
#endif #endif
int sqlite_db_create_aggregate(pTHX_ SV *dbh, const char *name, int argc, SV *aggr ); int sqlite_db_create_aggregate(pTHX_ SV *dbh, const char *name, int argc, SV *aggr, int flags );
int sqlite_db_create_collation(pTHX_ SV *dbh, const char *name, SV *func); int sqlite_db_create_collation(pTHX_ SV *dbh, const char *name, SV *func);
int sqlite_db_progress_handler(pTHX_ SV *dbh, int n_opcodes, SV *handler); int sqlite_db_progress_handler(pTHX_ SV *dbh, int n_opcodes, SV *handler);
int sqlite_bind_col( SV *sth, imp_sth_t *imp_sth, SV *col, SV *ref, IV sql_type, SV *attribs ); int sqlite_bind_col( SV *sth, imp_sth_t *imp_sth, SV *col, SV *ref, IV sql_type, SV *attribs );

31
t/09_create_function.t
View file

@ -10,8 +10,15 @@ BEGIN {
use t::lib::Test qw/connect_ok @CALL_FUNCS/; use t::lib::Test qw/connect_ok @CALL_FUNCS/;
use Test::More; use Test::More;
use Test::NoWarnings; use Test::NoWarnings;
use DBD::SQLite;
use DBD::SQLite::Constants;
plan tests => 29 * @CALL_FUNCS + 1; my @function_flags = (undef, 0);
if ($DBD::SQLite::sqlite_version_number >= 3008003) {
push @function_flags, DBD::SQLite::Constants::SQLITE_DETERMINISTIC;
}
plan tests => 29 * @CALL_FUNCS * @function_flags + 1;
sub now { sub now {
return time(); return time();
@ -53,10 +60,10 @@ sub noop {
return $_[0]; return $_[0];
} }
foreach my $call_func (@CALL_FUNCS) { foreach my $call_func (@CALL_FUNCS) { for my $flags (@function_flags) {
my $dbh = connect_ok( PrintError => 0 ); my $dbh = connect_ok( PrintError => 0 );
ok($dbh->$call_func( "now", 0, \&now, "create_function" )); ok($dbh->$call_func( "now", 0, \&now, defined $flags ? $flags : (), "create_function" ));
my $result = $dbh->selectrow_arrayref( "SELECT now()" ); my $result = $dbh->selectrow_arrayref( "SELECT now()" );
ok( $result->[0], 'Got a result' ); ok( $result->[0], 'Got a result' );
@ -65,35 +72,35 @@ foreach my $call_func (@CALL_FUNCS) {
$dbh->do( 'INSERT INTO func_test VALUES ( 1, 3 )' ); $dbh->do( 'INSERT INTO func_test VALUES ( 1, 3 )' );
$dbh->do( 'INSERT INTO func_test VALUES ( 0, 4 )' ); $dbh->do( 'INSERT INTO func_test VALUES ( 0, 4 )' );
ok($dbh->$call_func( "add2", 2, \&add2, "create_function" )); ok($dbh->$call_func( "add2", 2, \&add2, defined $flags ? $flags : (), "create_function" ));
$result = $dbh->selectrow_arrayref( "SELECT add2(1,3)" ); $result = $dbh->selectrow_arrayref( "SELECT add2(1,3)" );
is($result->[0], 4, "SELECT add2(1,3)" ); is($result->[0], 4, "SELECT add2(1,3)" );
$result = $dbh->selectall_arrayref( "SELECT add2(a,b) FROM func_test" ); $result = $dbh->selectall_arrayref( "SELECT add2(a,b) FROM func_test" );
is_deeply( $result, [ [4], [4] ], "SELECT add2(a,b) FROM func_test" ); is_deeply( $result, [ [4], [4] ], "SELECT add2(a,b) FROM func_test" );
ok($dbh->$call_func( "my_sum", -1, \&my_sum, "create_function" )); ok($dbh->$call_func( "my_sum", -1, \&my_sum, defined $flags ? $flags : (), "create_function" ));
$result = $dbh->selectrow_arrayref( "SELECT my_sum( '2', 3, 4, '5')" ); $result = $dbh->selectrow_arrayref( "SELECT my_sum( '2', 3, 4, '5')" );
is( $result->[0], 14, "SELECT my_sum( '2', 3, 4, '5')" ); is( $result->[0], 14, "SELECT my_sum( '2', 3, 4, '5')" );
ok($dbh->$call_func( "error", -1, \&error, "create_function" )); ok($dbh->$call_func( "error", -1, \&error, defined $flags ? $flags : (), "create_function" ));
$result = $dbh->selectrow_arrayref( "SELECT error( 'I died' )" ); $result = $dbh->selectrow_arrayref( "SELECT error( 'I died' )" );
ok( !$result ); ok( !$result );
like( $DBI::errstr, qr/function is dying: I died/ ); like( $DBI::errstr, qr/function is dying: I died/ );
ok($dbh->$call_func( "void_return", -1, \&void_return, "create_function" )); ok($dbh->$call_func( "void_return", -1, \&void_return, defined $flags ? $flags : (), "create_function" ));
$result = $dbh->selectrow_arrayref( "SELECT void_return( 'I died' )" ); $result = $dbh->selectrow_arrayref( "SELECT void_return( 'I died' )" );
is_deeply( $result, [ undef ], "SELECT void_return( 'I died' )" ); is_deeply( $result, [ undef ], "SELECT void_return( 'I died' )" );
ok($dbh->$call_func( "return_null", -1, \&return_null, "create_function" )); ok($dbh->$call_func( "return_null", -1, \&return_null, defined $flags ? $flags : (), "create_function" ));
$result = $dbh->selectrow_arrayref( "SELECT return_null()" ); $result = $dbh->selectrow_arrayref( "SELECT return_null()" );
is_deeply( $result, [ undef ], "SELECT return_null()" ); is_deeply( $result, [ undef ], "SELECT return_null()" );
ok($dbh->$call_func( "return2", -1, \&return2, "create_function" )); ok($dbh->$call_func( "return2", -1, \&return2, defined $flags ? $flags : (), "create_function" ));
$result = $dbh->selectrow_arrayref( "SELECT return2()" ); $result = $dbh->selectrow_arrayref( "SELECT return2()" );
is_deeply( $result, [ 2 ], "SELECT return2()" ); is_deeply( $result, [ 2 ], "SELECT return2()" );
ok($dbh->$call_func( "my_defined", 1, \&my_defined, "create_function" )); ok($dbh->$call_func( "my_defined", 1, \&my_defined, defined $flags ? $flags : (), "create_function" ));
$result = $dbh->selectrow_arrayref( "SELECT my_defined(1)" ); $result = $dbh->selectrow_arrayref( "SELECT my_defined(1)" );
is_deeply( $result, [ 1 ], "SELECT my_defined(1)" ); is_deeply( $result, [ 1 ], "SELECT my_defined(1)" );
@ -106,7 +113,7 @@ foreach my $call_func (@CALL_FUNCS) {
$result = $dbh->selectrow_arrayref( "SELECT my_defined(NULL)" ); $result = $dbh->selectrow_arrayref( "SELECT my_defined(NULL)" );
is_deeply( $result, [ '0' ], "SELECT my_defined(NULL)" ); is_deeply( $result, [ '0' ], "SELECT my_defined(NULL)" );
ok($dbh->$call_func( "noop", 1, \&noop, "create_function" )); ok($dbh->$call_func( "noop", 1, \&noop, defined $flags ? $flags : (), "create_function" ));
$result = $dbh->selectrow_arrayref( "SELECT noop(NULL)" ); $result = $dbh->selectrow_arrayref( "SELECT noop(NULL)" );
is_deeply( $result, [ undef ], "SELECT noop(NULL)" ); is_deeply( $result, [ undef ], "SELECT noop(NULL)" );
@ -127,4 +134,4 @@ foreach my $call_func (@CALL_FUNCS) {
is_deeply( $result, [ 'integer' ], "SELECT typeof(noop(2147483648))" ); is_deeply( $result, [ 'integer' ], "SELECT typeof(noop(2147483648))" );
$dbh->disconnect; $dbh->disconnect;
} }}

21
t/10_create_aggregate.t
View file

@ -9,8 +9,15 @@ BEGIN {
use t::lib::Test qw/connect_ok @CALL_FUNCS/; use t::lib::Test qw/connect_ok @CALL_FUNCS/;
use Test::More; use Test::More;
use Test::NoWarnings; use Test::NoWarnings;
use DBD::SQLite;
use DBD::SQLite::Constants;
plan tests => 21 * @CALL_FUNCS + 1; my @function_flags = (undef, 0);
if ($DBD::SQLite::sqlite_version_number >= 3008003) {
push @function_flags, DBD::SQLite::Constants::SQLITE_DETERMINISTIC;
}
plan tests => 21 * @CALL_FUNCS * @function_flags + 1;
# Create the aggregate test packages # Create the aggregate test packages
SCOPE: { SCOPE: {
@ -70,7 +77,7 @@ SCOPE: {
} }
} }
foreach my $call_func (@CALL_FUNCS) { foreach my $call_func (@CALL_FUNCS) { for my $flags (@function_flags) {
my $dbh = connect_ok( PrintError => 0 ); my $dbh = connect_ok( PrintError => 0 );
$dbh->do( "CREATE TABLE aggr_test ( field )" ); $dbh->do( "CREATE TABLE aggr_test ( field )" );
@ -78,7 +85,7 @@ foreach my $call_func (@CALL_FUNCS) {
$dbh->do( "INSERT INTO aggr_test VALUES ( $val )" ); $dbh->do( "INSERT INTO aggr_test VALUES ( $val )" );
} }
ok($dbh->$call_func( "newcount", 0, "count_aggr", "create_aggregate" )); ok($dbh->$call_func( "newcount", 0, "count_aggr", defined $flags ? $flags : (), "create_aggregate" ));
my $result = $dbh->selectrow_arrayref( "SELECT newcount() FROM aggr_test" ); my $result = $dbh->selectrow_arrayref( "SELECT newcount() FROM aggr_test" );
ok( $result && $result->[0] == 3 ); ok( $result && $result->[0] == 3 );
@ -96,7 +103,7 @@ foreach my $call_func (@CALL_FUNCS) {
$result = $dbh->selectrow_arrayref( "SELECT newcount() FROM aggr_empty_test" ); $result = $dbh->selectrow_arrayref( "SELECT newcount() FROM aggr_empty_test" );
ok( $result && !$result->[0] ); ok( $result && !$result->[0] );
ok($dbh->$call_func( "defined", 1, 'obj_aggregate', "create_aggregate" )); ok($dbh->$call_func( "defined", 1, 'obj_aggregate', defined $flags ? $flags : (), "create_aggregate" ));
$result = $dbh->selectrow_arrayref( "SELECT defined(field) FROM aggr_test" ); $result = $dbh->selectrow_arrayref( "SELECT defined(field) FROM aggr_test" );
ok( $result && $result->[0] == 2 ); ok( $result && $result->[0] == 2 );
$result = $dbh->selectrow_arrayref( "SELECT defined(field) FROM aggr_test" ); $result = $dbh->selectrow_arrayref( "SELECT defined(field) FROM aggr_test" );
@ -111,7 +118,7 @@ foreach my $call_func (@CALL_FUNCS) {
foreach my $fail ( qw/ new step finalize/ ) { foreach my $fail ( qw/ new step finalize/ ) {
$last_warn = ''; $last_warn = '';
my $aggr = fail_aggregate->new( $fail ); my $aggr = fail_aggregate->new( $fail );
ok($dbh->$call_func( "fail_$fail", -1, $aggr, 'create_aggregate' )); ok($dbh->$call_func( "fail_$fail", -1, $aggr, defined $flags ? $flags : (), 'create_aggregate' ));
$result = $dbh->selectrow_arrayref( "SELECT fail_$fail() FROM aggr_test" ); $result = $dbh->selectrow_arrayref( "SELECT fail_$fail() FROM aggr_test" );
# ok( !$result && $DBI::errstr =~ /$fail\(\) failed on request/ ); # ok( !$result && $DBI::errstr =~ /$fail\(\) failed on request/ );
ok( !defined $result->[0] && $last_warn =~ /$fail\(\) failed on request/ ); ok( !defined $result->[0] && $last_warn =~ /$fail\(\) failed on request/ );
@ -126,10 +133,10 @@ foreach my $call_func (@CALL_FUNCS) {
my $aggr = fail_aggregate->new( 'undef' ); my $aggr = fail_aggregate->new( 'undef' );
$last_warn = ''; $last_warn = '';
ok($dbh->$call_func( "fail_undef", -1, $aggr, 'create_aggregate' )); ok($dbh->$call_func( "fail_undef", -1, $aggr, defined $flags ? $flags : (), 'create_aggregate' ));
$result = $dbh->selectrow_arrayref( "SELECT fail_undef() FROM aggr_test" ); $result = $dbh->selectrow_arrayref( "SELECT fail_undef() FROM aggr_test" );
# ok( !$result && $DBI::errstr =~ /new\(\) should return a blessed reference/ ); # ok( !$result && $DBI::errstr =~ /new\(\) should return a blessed reference/ );
ok( !defined $result->[0] && $last_warn =~ /new\(\) should return a blessed reference/ ); ok( !defined $result->[0] && $last_warn =~ /new\(\) should return a blessed reference/ );
$dbh->disconnect; $dbh->disconnect;
} }}