Skip to content

Commit

Permalink
better gitignore
Browse files Browse the repository at this point in the history
  • Loading branch information
matias alejo garcia committed Oct 15, 2012
1 parent 83c6415 commit b7e816c
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Expand Up @@ -4,4 +4,4 @@
tags
blib
Makefile

Makefile.old
25 changes: 16 additions & 9 deletions Makefile
View file
Expand Up @@ -17,7 +17,7 @@
# CONFIGURE_REQUIRES => { }
# MIN_PERL_VERSION => q[5.010000]
# NAME => q[SQL::Bibliosoph]
# PREREQ_PM => { DBD::Mock=>q[1.43], Package::Constants=>q[0.02], Tie::Hash::Random=>q[1], Storable=>q[2.3], Time::HiRes=>q[1.97], Carp=>q[1.25], Test::More=>q[0.88], Digest::MD5=>q[2.39], DBD::mysql=>q[4.004], Cache::Memcached::Fast=>q[0.17], Moose=>q[0.82], Tie::Array::Random=>q[1], DBI=>q[1.5] }
# PREREQ_PM => { DBD::Mock=>q[1.43], Package::Constants=>q[0.02], Tie::Hash::Random=>q[1], Storable=>q[2.3], Time::HiRes=>q[1.97], Carp=>q[1.25], Exception::Class=>q[1.3], Test::More=>q[0.88], DBD::mysql=>q[4.004], Digest::MD5=>q[2.39], Cache::Memcached::Fast=>q[0.17], Moose=>q[0.82], Tie::Array::Random=>q[1], DBI=>q[1.5] }
# VERSION_FROM => q[lib/SQL/Bibliosoph.pm]

# --- MakeMaker post_initialize section:
Expand Down Expand Up @@ -57,11 +57,11 @@ DIRFILESEP = /
DFSEP = $(DIRFILESEP)
NAME = SQL::Bibliosoph
NAME_SYM = SQL_Bibliosoph
VERSION = 2.47
VERSION = 2.50
VERSION_MACRO = VERSION
VERSION_SYM = 2_47
VERSION_SYM = 2_50
DEFINE_VERSION = -D$(VERSION_MACRO)=\"$(VERSION)\"
XS_VERSION = 2.47
XS_VERSION = 2.50
XS_VERSION_MACRO = XS_VERSION
XS_DEFINE_VERSION = -D$(XS_VERSION_MACRO)=\"$(XS_VERSION)\"
INST_ARCHLIB = blib/arch
Expand Down Expand Up @@ -189,10 +189,13 @@ PERL_ARCHIVE_AFTER =
TO_INST_PM = lib/SQL/Bibliosoph.pm \
lib/SQL/Bibliosoph/CatalogFile.pm \
lib/SQL/Bibliosoph/Dummy.pm \
lib/SQL/Bibliosoph/Exceptions.pm \
lib/SQL/Bibliosoph/Query.pm \
lib/SQL/Bibliosoph/Sims.pm

PM_TO_BLIB = lib/SQL/Bibliosoph/Dummy.pm \
PM_TO_BLIB = lib/SQL/Bibliosoph/Exceptions.pm \
blib/lib/SQL/Bibliosoph/Exceptions.pm \
lib/SQL/Bibliosoph/Dummy.pm \
blib/lib/SQL/Bibliosoph/Dummy.pm \
lib/SQL/Bibliosoph/Query.pm \
blib/lib/SQL/Bibliosoph/Query.pm \
Expand Down Expand Up @@ -270,7 +273,7 @@ RCS_LABEL = rcs -Nv$(VERSION_SYM): -q
DIST_CP = best
DIST_DEFAULT = tardist
DISTNAME = SQL-Bibliosoph
DISTVNAME = SQL-Bibliosoph-2.47
DISTVNAME = SQL-Bibliosoph-2.50


# --- MakeMaker macro section:
Expand Down Expand Up @@ -522,6 +525,7 @@ metafile : create_distdir
$(NOECHO) $(ECHO) ' DBD::mysql: 4.004' >> META_new.yml
$(NOECHO) $(ECHO) ' DBI: 1.5' >> META_new.yml
$(NOECHO) $(ECHO) ' Digest::MD5: 2.39' >> META_new.yml
$(NOECHO) $(ECHO) ' Exception::Class: 1.3' >> META_new.yml
$(NOECHO) $(ECHO) ' Moose: 0.82' >> META_new.yml
$(NOECHO) $(ECHO) ' Package::Constants: 0.02' >> META_new.yml
$(NOECHO) $(ECHO) ' Storable: 2.3' >> META_new.yml
Expand All @@ -530,7 +534,7 @@ metafile : create_distdir
$(NOECHO) $(ECHO) ' Tie::Hash::Random: 1' >> META_new.yml
$(NOECHO) $(ECHO) ' Time::HiRes: 1.97' >> META_new.yml
$(NOECHO) $(ECHO) ' perl: 5.010000' >> META_new.yml
$(NOECHO) $(ECHO) 'version: 2.47' >> META_new.yml
$(NOECHO) $(ECHO) 'version: 2.50' >> META_new.yml
-$(NOECHO) $(MV) META_new.yml $(DISTVNAME)/META.yml
$(NOECHO) $(ECHO) Generating META.json
$(NOECHO) $(ECHO) '{' > META_new.json
Expand Down Expand Up @@ -573,6 +577,7 @@ metafile : create_distdir
$(NOECHO) $(ECHO) ' "DBD::mysql" : "4.004",' >> META_new.json
$(NOECHO) $(ECHO) ' "DBI" : "1.5",' >> META_new.json
$(NOECHO) $(ECHO) ' "Digest::MD5" : "2.39",' >> META_new.json
$(NOECHO) $(ECHO) ' "Exception::Class" : "1.3",' >> META_new.json
$(NOECHO) $(ECHO) ' "Moose" : "0.82",' >> META_new.json
$(NOECHO) $(ECHO) ' "Package::Constants" : "0.02",' >> META_new.json
$(NOECHO) $(ECHO) ' "Storable" : "2.3",' >> META_new.json
Expand All @@ -585,7 +590,7 @@ metafile : create_distdir
$(NOECHO) $(ECHO) ' }' >> META_new.json
$(NOECHO) $(ECHO) ' },' >> META_new.json
$(NOECHO) $(ECHO) ' "release_status" : "stable",' >> META_new.json
$(NOECHO) $(ECHO) ' "version" : "2.47"' >> META_new.json
$(NOECHO) $(ECHO) ' "version" : "2.50"' >> META_new.json
$(NOECHO) $(ECHO) '}' >> META_new.json
-$(NOECHO) $(MV) META_new.json $(DISTVNAME)/META.json

Expand Down Expand Up @@ -881,7 +886,7 @@ testdb_static :: testdb_dynamic
# --- MakeMaker ppd section:
# Creates a PPD (Perl Package Description) for a binary distribution.
ppd :
$(NOECHO) $(ECHO) '<SOFTPKG NAME="$(DISTNAME)" VERSION="2.47">' > $(DISTNAME).ppd
$(NOECHO) $(ECHO) '<SOFTPKG NAME="$(DISTNAME)" VERSION="2.50">' > $(DISTNAME).ppd
$(NOECHO) $(ECHO) ' <ABSTRACT>A SQL Query library</ABSTRACT>' >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) ' <AUTHOR>Matias Alejo Garcia ( matiu@cpan.org ) </AUTHOR>' >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) ' <IMPLEMENTATION>' >> $(DISTNAME).ppd
Expand All @@ -892,6 +897,7 @@ ppd :
$(NOECHO) $(ECHO) ' <REQUIRE NAME="DBD::mysql" VERSION="4.004" />' >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) ' <REQUIRE NAME="DBI::" VERSION="1.5" />' >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) ' <REQUIRE NAME="Digest::MD5" VERSION="2.39" />' >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) ' <REQUIRE NAME="Exception::Class" VERSION="1.3" />' >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) ' <REQUIRE NAME="Moose::" VERSION="0.82" />' >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) ' <REQUIRE NAME="Package::Constants" VERSION="0.02" />' >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) ' <REQUIRE NAME="Storable::" VERSION="2.3" />' >> $(DISTNAME).ppd
Expand All @@ -909,6 +915,7 @@ ppd :

pm_to_blib : $(FIRST_MAKEFILE) $(TO_INST_PM)
$(NOECHO) $(ABSPERLRUN) -MExtUtils::Install -e 'pm_to_blib({@ARGV}, '\''$(INST_LIB)/auto'\'', q[$(PM_FILTER)], '\''$(PERM_DIR)'\'')' -- \
lib/SQL/Bibliosoph/Exceptions.pm blib/lib/SQL/Bibliosoph/Exceptions.pm \
lib/SQL/Bibliosoph/Dummy.pm blib/lib/SQL/Bibliosoph/Dummy.pm \
lib/SQL/Bibliosoph/Query.pm blib/lib/SQL/Bibliosoph/Query.pm \
lib/SQL/Bibliosoph.pm blib/lib/SQL/Bibliosoph.pm \
Expand Down
1 change: 1 addition & 0 deletions Makefile.PL
View file
Expand Up @@ -21,6 +21,7 @@ WriteMakefile(
'Digest::MD5' => 2.39,
'Cache::Memcached::Fast' => 0.17,
'Storable' => 2.30,
'Exception::Class' => 1.30,
},
MIN_PERL_VERSION => '5.10.0',
);
Expand Down
25 changes: 16 additions & 9 deletions Makefile.old
View file
Expand Up @@ -17,7 +17,7 @@
# CONFIGURE_REQUIRES => { }
# MIN_PERL_VERSION => q[5.010000]
# NAME => q[SQL::Bibliosoph]
# PREREQ_PM => { DBD::Mock=>q[1.43], Package::Constants=>q[0.02], Tie::Hash::Random=>q[1], Storable=>q[2.3], Time::HiRes=>q[1.97], Carp=>q[1.25], Test::More=>q[0.88], Digest::MD5=>q[2.39], DBD::mysql=>q[4.004], Cache::Memcached::Fast=>q[0.17], Moose=>q[0.82], Tie::Array::Random=>q[1], DBI=>q[1.5] }
# PREREQ_PM => { DBD::Mock=>q[1.43], Package::Constants=>q[0.02], Tie::Hash::Random=>q[1], Storable=>q[2.3], Time::HiRes=>q[1.97], Carp=>q[1.25], Exception::Class=>q[1.3], Test::More=>q[0.88], DBD::mysql=>q[4.004], Digest::MD5=>q[2.39], Cache::Memcached::Fast=>q[0.17], Moose=>q[0.82], Tie::Array::Random=>q[1], DBI=>q[1.5] }
# VERSION_FROM => q[lib/SQL/Bibliosoph.pm]

# --- MakeMaker post_initialize section:
Expand Down Expand Up @@ -57,11 +57,11 @@ DIRFILESEP = /
DFSEP = $(DIRFILESEP)
NAME = SQL::Bibliosoph
NAME_SYM = SQL_Bibliosoph
VERSION = 2.46
VERSION = 2.50
VERSION_MACRO = VERSION
VERSION_SYM = 2_46
VERSION_SYM = 2_50
DEFINE_VERSION = -D$(VERSION_MACRO)=\"$(VERSION)\"
XS_VERSION = 2.46
XS_VERSION = 2.50
XS_VERSION_MACRO = XS_VERSION
XS_DEFINE_VERSION = -D$(XS_VERSION_MACRO)=\"$(XS_VERSION)\"
INST_ARCHLIB = blib/arch
Expand Down Expand Up @@ -189,10 +189,13 @@ PERL_ARCHIVE_AFTER =
TO_INST_PM = lib/SQL/Bibliosoph.pm \
lib/SQL/Bibliosoph/CatalogFile.pm \
lib/SQL/Bibliosoph/Dummy.pm \
lib/SQL/Bibliosoph/Exceptions.pm \
lib/SQL/Bibliosoph/Query.pm \
lib/SQL/Bibliosoph/Sims.pm

PM_TO_BLIB = lib/SQL/Bibliosoph/Dummy.pm \
PM_TO_BLIB = lib/SQL/Bibliosoph/Exceptions.pm \
blib/lib/SQL/Bibliosoph/Exceptions.pm \
lib/SQL/Bibliosoph/Dummy.pm \
blib/lib/SQL/Bibliosoph/Dummy.pm \
lib/SQL/Bibliosoph/Query.pm \
blib/lib/SQL/Bibliosoph/Query.pm \
Expand Down Expand Up @@ -270,7 +273,7 @@ RCS_LABEL = rcs -Nv$(VERSION_SYM): -q
DIST_CP = best
DIST_DEFAULT = tardist
DISTNAME = SQL-Bibliosoph
DISTVNAME = SQL-Bibliosoph-2.46
DISTVNAME = SQL-Bibliosoph-2.50


# --- MakeMaker macro section:
Expand Down Expand Up @@ -522,6 +525,7 @@ metafile : create_distdir
$(NOECHO) $(ECHO) ' DBD::mysql: 4.004' >> META_new.yml
$(NOECHO) $(ECHO) ' DBI: 1.5' >> META_new.yml
$(NOECHO) $(ECHO) ' Digest::MD5: 2.39' >> META_new.yml
$(NOECHO) $(ECHO) ' Exception::Class: 1.3' >> META_new.yml
$(NOECHO) $(ECHO) ' Moose: 0.82' >> META_new.yml
$(NOECHO) $(ECHO) ' Package::Constants: 0.02' >> META_new.yml
$(NOECHO) $(ECHO) ' Storable: 2.3' >> META_new.yml
Expand All @@ -530,7 +534,7 @@ metafile : create_distdir
$(NOECHO) $(ECHO) ' Tie::Hash::Random: 1' >> META_new.yml
$(NOECHO) $(ECHO) ' Time::HiRes: 1.97' >> META_new.yml
$(NOECHO) $(ECHO) ' perl: 5.010000' >> META_new.yml
$(NOECHO) $(ECHO) 'version: 2.46' >> META_new.yml
$(NOECHO) $(ECHO) 'version: 2.50' >> META_new.yml
-$(NOECHO) $(MV) META_new.yml $(DISTVNAME)/META.yml
$(NOECHO) $(ECHO) Generating META.json
$(NOECHO) $(ECHO) '{' > META_new.json
Expand Down Expand Up @@ -573,6 +577,7 @@ metafile : create_distdir
$(NOECHO) $(ECHO) ' "DBD::mysql" : "4.004",' >> META_new.json
$(NOECHO) $(ECHO) ' "DBI" : "1.5",' >> META_new.json
$(NOECHO) $(ECHO) ' "Digest::MD5" : "2.39",' >> META_new.json
$(NOECHO) $(ECHO) ' "Exception::Class" : "1.3",' >> META_new.json
$(NOECHO) $(ECHO) ' "Moose" : "0.82",' >> META_new.json
$(NOECHO) $(ECHO) ' "Package::Constants" : "0.02",' >> META_new.json
$(NOECHO) $(ECHO) ' "Storable" : "2.3",' >> META_new.json
Expand All @@ -585,7 +590,7 @@ metafile : create_distdir
$(NOECHO) $(ECHO) ' }' >> META_new.json
$(NOECHO) $(ECHO) ' },' >> META_new.json
$(NOECHO) $(ECHO) ' "release_status" : "stable",' >> META_new.json
$(NOECHO) $(ECHO) ' "version" : "2.46"' >> META_new.json
$(NOECHO) $(ECHO) ' "version" : "2.50"' >> META_new.json
$(NOECHO) $(ECHO) '}' >> META_new.json
-$(NOECHO) $(MV) META_new.json $(DISTVNAME)/META.json

Expand Down Expand Up @@ -881,7 +886,7 @@ testdb_static :: testdb_dynamic
# --- MakeMaker ppd section:
# Creates a PPD (Perl Package Description) for a binary distribution.
ppd :
$(NOECHO) $(ECHO) '<SOFTPKG NAME="$(DISTNAME)" VERSION="2.46">' > $(DISTNAME).ppd
$(NOECHO) $(ECHO) '<SOFTPKG NAME="$(DISTNAME)" VERSION="2.50">' > $(DISTNAME).ppd
$(NOECHO) $(ECHO) ' <ABSTRACT>A SQL Query library</ABSTRACT>' >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) ' <AUTHOR>Matias Alejo Garcia ( matiu@cpan.org ) </AUTHOR>' >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) ' <IMPLEMENTATION>' >> $(DISTNAME).ppd
Expand All @@ -892,6 +897,7 @@ ppd :
$(NOECHO) $(ECHO) ' <REQUIRE NAME="DBD::mysql" VERSION="4.004" />' >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) ' <REQUIRE NAME="DBI::" VERSION="1.5" />' >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) ' <REQUIRE NAME="Digest::MD5" VERSION="2.39" />' >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) ' <REQUIRE NAME="Exception::Class" VERSION="1.3" />' >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) ' <REQUIRE NAME="Moose::" VERSION="0.82" />' >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) ' <REQUIRE NAME="Package::Constants" VERSION="0.02" />' >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) ' <REQUIRE NAME="Storable::" VERSION="2.3" />' >> $(DISTNAME).ppd
Expand All @@ -909,6 +915,7 @@ ppd :

pm_to_blib : $(FIRST_MAKEFILE) $(TO_INST_PM)
$(NOECHO) $(ABSPERLRUN) -MExtUtils::Install -e 'pm_to_blib({@ARGV}, '\''$(INST_LIB)/auto'\'', q[$(PM_FILTER)], '\''$(PERM_DIR)'\'')' -- \
lib/SQL/Bibliosoph/Exceptions.pm blib/lib/SQL/Bibliosoph/Exceptions.pm \
lib/SQL/Bibliosoph/Dummy.pm blib/lib/SQL/Bibliosoph/Dummy.pm \
lib/SQL/Bibliosoph/Query.pm blib/lib/SQL/Bibliosoph/Query.pm \
lib/SQL/Bibliosoph.pm blib/lib/SQL/Bibliosoph.pm \
Expand Down
7 changes: 3 additions & 4 deletions lib/SQL/Bibliosoph.pm
View file
@@ -1,7 +1,6 @@
package SQL::Bibliosoph; {
use Moose;

use Carp;
use Data::Dumper;
use Digest::MD5 qw/ md5_hex /;
use Cache::Memcached::Fast;
Expand All @@ -10,7 +9,7 @@ package SQL::Bibliosoph; {
use SQL::Bibliosoph::Query;
use SQL::Bibliosoph::CatalogFile;

our $VERSION = "2.47";
our $VERSION = "2.50";


has 'dbh' => ( is => 'ro', isa => 'DBI::db', required=> 1);
Expand Down Expand Up @@ -662,8 +661,8 @@ SQL::Bibliosoph supports bind parameters in statements definition and bind
parements reordering (See SQL::Bibliosoph::CatalogFile for details).
All functions throw 'carp' on error. The error message is 'SQL ERROR' and the
mysql error reported by the driver.
All functions throw 'SQL::Bibliosoph::Exception::QuerySyntaxError' on error. The
error message is 'SQL ERROR' and the mysql error reported by the driver.
=head1 Constructor parameters
Expand Down
7 changes: 5 additions & 2 deletions lib/SQL/Bibliosoph/Query.pm
View file
Expand Up @@ -7,6 +7,7 @@ package SQL::Bibliosoph::Query; {
use feature qw(say);

use SQL::Bibliosoph::Dummy;
use SQL::Bibliosoph::Exceptions;

our $VERSION = "2.00";

Expand All @@ -22,7 +23,7 @@ package SQL::Bibliosoph::Query; {
has bind_links => ( is => 'rw', default => sub { return []; } );
has bind_params=> ( is => 'rw');

has throw_errors=> ( is => 'rw', default=> 1);
has throw_errors=> ( is => 'rw', default => 1);



Expand Down Expand Up @@ -202,7 +203,9 @@ package SQL::Bibliosoph::Query; {

if ($self->throw_errors() ) {
# $sth->err and $DBI::err will be true if error was from DBI
carp $e unless $self->quiet() ; # print the error
SQL::Bibliosoph::Exception::QuerySyntaxError->throw (
desc => $e,
) unless $self->quiet() ; # print the error
}
else {
print STDERR $e;
Expand Down
9 changes: 8 additions & 1 deletion t/biblio.t
View file
Expand Up @@ -17,6 +17,10 @@ SELECT * FROM users WHERE id = #1? AND name = 2?
--[ USERS3 ]
SELECT * FROM users WHERE id = #1? AND name = 2?
--[ BROKEN ]
SELECT * BROKEN users WHERE id = #1? AND name = 2?
END
Expand All @@ -27,7 +31,8 @@ my $dbh = DBI->connect('DBI:Mock:', '', '')

require_ok('SQL::Bibliosoph');

my $bb = new SQL::Bibliosoph( {dbh => $dbh, catalog_str => $str } );
my $bb = new SQL::Bibliosoph( {dbh => $dbh, catalog_str => $str,
} );

isa_ok($bb,'SQL::Bibliosoph');

Expand All @@ -48,4 +53,6 @@ is(ref($q),'HASH','Simple query 3');
$q = $bb->USERS3_sth();
is(ref($q), 'DBI::st', 'Simple query 3 STH');



done_testing();

0 comments on commit b7e816c

Please sign in to comment.