Added DISTINCT when only wanting one row

Changes

@@ -4,6 +4,7 @@ Revision history for Geo-Coder-Free
 	Fix http://www.cpantesters.org/cpan/report/b10c956b-6bf9-1014-9a47-dc46d49c4260
 	Allow known peculiarities to be found
 	Improve handling of US lookups
+	Added DISTINCT when only wanting one row
 
 0.04	Thu Oct 26 22:05:54 EDT 2017
 	Fix throw in http://www.cpantesters.org/cpan/report/ab86a142-b8d9-11e7-a1cf-bb670eaac09d

Makefile.PL

@@ -33,6 +33,7 @@ WriteMakefile(
 		'Module::Info' => 0,
 		'File::Spec' => 0,
 		'Error::Simple' => 0,
+		'CHI' => 0,
 	},
 	dist		=> { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
 	clean		=> { FILES => 'Geo-Coder-Free-*' },

lib/Geo/Coder/Free.pm

@@ -11,6 +11,7 @@ use Carp;
 use Error::Simple;
 use File::Spec;
 use Locale::US;
+use CHI;
 
 our %admin1cache;
 our %admin2cache;
@@ -76,7 +77,11 @@ sub new {
 
 	my $directory = Module::Info->new_from_loaded(__PACKAGE__)->file();
 	$directory =~ s/\.pm$//;
-	Geo::Coder::Free::DB::init(directory => File::Spec->catfile($directory, 'databases'));
+
+	Geo::Coder::Free::DB::init({
+		directory => File::Spec->catfile($directory, 'databases'),
+		cache => CHI->new(driver => 'Memory', datastore => { })
+	});
 
 	return bless { }, $class;
 }
@@ -380,7 +385,7 @@ VWF, Maxmind and geonames.
 
 =head1 LICENSE AND COPYRIGHT
 
-Copyright 2017 Nigel Horne.
+Copyright 2017-2018 Nigel Horne.
 
 The program code is released under the following licence: GPL for personal use on a single computer.
 All other users (including Commercial, Charity, Educational, Government)

lib/Geo/Coder/Free/DB.pm

@@ -1,5 +1,7 @@
 package Geo::Coder::Free::DB;
 
+# Read-only access to databases
+
 use warnings;
 use strict;
 
@@ -15,6 +17,7 @@ use Error::Simple;
 our @databases;
 our $directory;
 our $logger;
+our $cache;
 
 sub new {
 	my $proto = shift;
@@ -24,7 +27,11 @@ sub new {
 
 	# init(\%args);
 
-	return bless { logger => $args{'logger'} || $logger, directory => $args{'directory'} || $directory }, $class;
+	return bless {
+		logger => $args{'logger'} || $logger,
+		directory => $args{'directory'} || $directory,
+		cache => $args{'cache'} || $cache
+	}, $class;
 }
 
 # Can also be run as a class level Geo::Coder::Free::DB::init(directory => '../databases')
@@ -33,6 +40,7 @@ sub init {
 
 	$directory ||= $args{'directory'};
 	$logger ||= $args{'logger'};
+	$cache ||= $args{'cache'};
 	if($args{'databases'}) {
 		@databases = $args{'databases'};
 	}
@@ -216,10 +224,21 @@ sub selectall_hashref {
 	}
 	my $sth = $self->{$table}->prepare($query);
 	$sth->execute(@args) || throw Error::Simple("$query: @args");
+
+	my $key = "$query " . join(', ', @args);
+	my $c;
+	if($c = $self->{cache}) {
+		if(my $rc = $c->get($key)) {
+			return $rc;
+		}
+	}
 	my @rc;
 	while (my $href = $sth->fetchrow_hashref()) {
 		push @rc, $href;
 	}
+	if($c) {
+		$c->set($key, \@rc, '1 hour');
+	}
 
 	return \@rc;
 }
@@ -234,7 +253,7 @@ sub fetchrow_hashref {
 
 	$self->_open() if(!$self->{table});
 
-	my $query = "SELECT * FROM $table";
+	my $query = "SELECT DISTINCT * FROM $table";
 	my @args;
 	foreach my $c1(keys(%params)) {
 		if(scalar(@args) == 0) {
@@ -306,6 +325,9 @@ sub AUTOLOAD {
 	my $query = "SELECT DISTINCT $column FROM $table";
 	my @args;
 	foreach my $c1(keys(%params)) {
+		if(!defined($params{$c1})) {
+			$self->{'logger'}->debug("AUTOLOAD params $c1 isn't defined");
+		}
 		# $query .= " AND $c1 LIKE ?";
 		if(scalar(@args) == 0) {
 			$query .= ' WHERE';
@@ -317,7 +339,7 @@ sub AUTOLOAD {
 	}
 	$query .= " ORDER BY $column";
 	if($self->{'logger'}) {
-		if(scalar(@args)) {
+		if(scalar(@args) && $args[0]) {
 			$self->{'logger'}->debug("AUTOLOAD $query: " . join(', ', @args));
 		} else {
 			$self->{'logger'}->debug("AUTOLOAD $query");