Merge remote-tracking branch 'origin/new/bug_7276'

This commit is contained in:
Paul Poulain 2012-01-17 18:14:03 +01:00
commit d704808684

View file

@ -27,6 +27,22 @@ use C4::Debug;
require Exporter; require Exporter;
use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS); use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS);
eval {
my $servers = C4::Context->config('memcached_servers');
if ($servers) {
require Memoize::Memcached;
import Memoize::Memcached qw(memoize_memcached);
my $memcached = {
servers => [$servers],
key_prefix => C4::Context->config('memcached_namespace') || 'koha',
};
memoize_memcached( '_get_columns', memcached => $memcached, expire_time => 600000 ); #cache for 10 minutes
memoize_memcached( 'GetPrimaryKeys', memcached => $memcached, expire_time => 600000 ); #cache for 10 minutes
}
};
BEGIN { BEGIN {
# set the version for version checking # set the version for version checking
$VERSION = 0.5; $VERSION = 0.5;
@ -38,11 +54,15 @@ BEGIN {
SearchInTable SearchInTable
UpdateInTable UpdateInTable
GetPrimaryKeys GetPrimaryKeys
clear_columns_cache
); );
%EXPORT_TAGS = ( all =>[qw( InsertInTable DeleteInTable SearchInTable UpdateInTable GetPrimaryKeys)] %EXPORT_TAGS = ( all =>[qw( InsertInTable DeleteInTable SearchInTable UpdateInTable GetPrimaryKeys)]
); );
} }
my $tablename;
my $hashref;
=head1 NAME =head1 NAME
C4::SQLHelper - Perl Module containing convenience functions for SQL Handling C4::SQLHelper - Perl Module containing convenience functions for SQL Handling
@ -233,6 +253,23 @@ sub GetPrimaryKeys($) {
return grep { $hash_columns->{$_}->{'Key'} =~/PRI/i} keys %$hash_columns; return grep { $hash_columns->{$_}->{'Key'} =~/PRI/i} keys %$hash_columns;
} }
=head2 clear_columns_cache
C4::SQLHelper->clear_columns_cache();
cleans the internal cache of sysprefs. Please call this method if
you update a tables structure. Otherwise, your new changes
will not be seen by this process.
=cut
sub clear_columns_cache {
%$hashref = ();
}
=head2 _get_columns =head2 _get_columns
_get_columns($tablename) _get_columns($tablename)
@ -247,16 +284,24 @@ With
=cut =cut
sub _get_columns($) { sub _get_columns($) {
my ($tablename)=@_; my ($tablename) = @_;
my $dbh=C4::Context->dbh; unless ( exists( $hashref->{$tablename} ) ) {
my $sth=$dbh->prepare_cached(qq{SHOW COLUMNS FROM $tablename }); my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare_cached(qq{SHOW COLUMNS FROM $tablename });
$sth->execute; $sth->execute;
my $columns= $sth->fetchall_hashref(qw(Field)); my $columns = $sth->fetchall_hashref(qw(Field));
$hashref->{$tablename} = $columns;
}
return $hashref->{$tablename};
} }
=head2 _filter_columns =head2 _filter_columns
_filter_columns($tablename,$research, $filtercolumns) =over 4
_filter_columns($tablename,$research, $filtercolumns)
=back
Given Given
- a tablename - a tablename