From b2043844ab12bd5a497a6bb8e9c784f2485b199a Mon Sep 17 00:00:00 2001 From: matias alejo garcia Date: Sat, 6 Oct 2012 13:07:54 -0300 Subject: [PATCH 1/9] . --- Makefile | 165 ++++++++++++++++++++++++++++++++---------- Makefile.PL | 13 ++-- lib/SQL/Bibliosoph.pm | 4 +- 3 files changed, 136 insertions(+), 46 deletions(-) diff --git a/Makefile b/Makefile index e2600e6..ea125d9 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # This Makefile is for the SQL::Bibliosoph extension to perl. # # It was generated automatically by MakeMaker version -# 6.58 (Revision: 65800) from the contents of +# 6.62 (Revision: 66200) from the contents of # Makefile.PL. Don't edit this file, edit Makefile.PL instead. # # ANY CHANGES MADE HERE WILL BE LOST! @@ -17,7 +17,7 @@ # CONFIGURE_REQUIRES => { } # MIN_PERL_VERSION => q[5.010000] # NAME => q[SQL::Bibliosoph] -# PREREQ_PM => { DBD::Mock=>q[0], Package::Constants=>q[0], Tie::Hash::Random=>q[1], Storable=>q[0], Time::HiRes=>q[0], Carp=>q[0], Test::More=>q[0.88], Digest::MD5=>q[2.39], DBD::mysql=>q[4.004], Cache::Memcached::Fast=>q[0.17], Devel::Cover=>q[0], 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], 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] } # VERSION_FROM => q[lib/SQL/Bibliosoph.pm] # --- MakeMaker post_initialize section: @@ -25,29 +25,29 @@ # --- MakeMaker const_config section: -# These definitions are from config.sh (via /opt/local/lib/perl5/5.10.1/darwin-2level/Config.pm). +# These definitions are from config.sh (via /opt/local/lib/perl5/5.10.1/darwin-thread-multi-2level/Config.pm). # They may have been overridden via Makefile.PL or on the command line. AR = ar -CC = /usr/bin/gcc-4.2 +CC = /usr/bin/clang CCCDLFLAGS = CCDLFLAGS = DLEXT = bundle DLSRC = dl_dlopen.xs EXE_EXT = FULL_AR = /usr/bin/ar -LD = env MACOSX_DEPLOYMENT_TARGET=10.3 cc -LDDLFLAGS = -L/opt/local/lib -bundle -undefined dynamic_lookup -fstack-protector -LDFLAGS = -L/opt/local/lib -fstack-protector -LIBC = /usr/lib/libc.dylib +LD = env MACOSX_DEPLOYMENT_TARGET=10.3 /usr/bin/clang +LDDLFLAGS = -L/opt/local/lib -bundle -undefined dynamic_lookup -fstack-protector +LDFLAGS = -L/opt/local/lib -fstack-protector +LIBC = LIB_EXT = .a OBJ_EXT = .o OSNAME = darwin -OSVERS = 10.2.0 +OSVERS = 11.3.0 RANLIB = ranlib SITELIBEXP = /opt/local/lib/perl5/site_perl/5.10.1 -SITEARCHEXP = /opt/local/lib/perl5/site_perl/5.10.1/darwin-2level +SITEARCHEXP = /opt/local/lib/perl5/site_perl/5.10.1/darwin-thread-multi-2level SO = dylib -VENDORARCHEXP = /opt/local/lib/perl5/vendor_perl/5.10.1/darwin-2level +VENDORARCHEXP = /opt/local/lib/perl5/vendor_perl/5.10.1/darwin-thread-multi-2level VENDORLIBEXP = /opt/local/lib/perl5/vendor_perl/5.10.1 @@ -57,11 +57,11 @@ DIRFILESEP = / DFSEP = $(DIRFILESEP) NAME = SQL::Bibliosoph NAME_SYM = SQL_Bibliosoph -VERSION = 2.45 +VERSION = 2.46 VERSION_MACRO = VERSION -VERSION_SYM = 2_45 +VERSION_SYM = 2_46 DEFINE_VERSION = -D$(VERSION_MACRO)=\"$(VERSION)\" -XS_VERSION = 2.45 +XS_VERSION = 2.46 XS_VERSION_MACRO = XS_VERSION XS_DEFINE_VERSION = -D$(XS_VERSION_MACRO)=\"$(XS_VERSION)\" INST_ARCHLIB = blib/arch @@ -70,8 +70,8 @@ INST_BIN = blib/bin INST_LIB = blib/lib INST_MAN1DIR = blib/man1 INST_MAN3DIR = blib/man3 -MAN1EXT = 1 -MAN3EXT = 3 +MAN1EXT = 1pm +MAN3EXT = 3pm INSTALLDIRS = site DESTDIR = PREFIX = $(SITEPREFIX) @@ -84,11 +84,11 @@ INSTALLSITELIB = /opt/local/lib/perl5/site_perl/5.10.1 DESTINSTALLSITELIB = $(DESTDIR)$(INSTALLSITELIB) INSTALLVENDORLIB = /opt/local/lib/perl5/vendor_perl/5.10.1 DESTINSTALLVENDORLIB = $(DESTDIR)$(INSTALLVENDORLIB) -INSTALLARCHLIB = /opt/local/lib/perl5/5.10.1/darwin-2level +INSTALLARCHLIB = /opt/local/lib/perl5/5.10.1/darwin-thread-multi-2level DESTINSTALLARCHLIB = $(DESTDIR)$(INSTALLARCHLIB) -INSTALLSITEARCH = /opt/local/lib/perl5/site_perl/5.10.1/darwin-2level +INSTALLSITEARCH = /opt/local/lib/perl5/site_perl/5.10.1/darwin-thread-multi-2level DESTINSTALLSITEARCH = $(DESTDIR)$(INSTALLSITEARCH) -INSTALLVENDORARCH = /opt/local/lib/perl5/vendor_perl/5.10.1/darwin-2level +INSTALLVENDORARCH = /opt/local/lib/perl5/vendor_perl/5.10.1/darwin-thread-multi-2level DESTINSTALLVENDORARCH = $(DESTDIR)$(INSTALLVENDORARCH) INSTALLBIN = /opt/local/bin DESTINSTALLBIN = $(DESTDIR)$(INSTALLBIN) @@ -102,26 +102,26 @@ INSTALLSITESCRIPT = /opt/local/bin DESTINSTALLSITESCRIPT = $(DESTDIR)$(INSTALLSITESCRIPT) INSTALLVENDORSCRIPT = /opt/local/bin DESTINSTALLVENDORSCRIPT = $(DESTDIR)$(INSTALLVENDORSCRIPT) -INSTALLMAN1DIR = /opt/local/share/man/man1 +INSTALLMAN1DIR = /opt/local/share/man/man1p DESTINSTALLMAN1DIR = $(DESTDIR)$(INSTALLMAN1DIR) INSTALLSITEMAN1DIR = /opt/local/share/man/man1 DESTINSTALLSITEMAN1DIR = $(DESTDIR)$(INSTALLSITEMAN1DIR) INSTALLVENDORMAN1DIR = /opt/local/share/man/man1 DESTINSTALLVENDORMAN1DIR = $(DESTDIR)$(INSTALLVENDORMAN1DIR) -INSTALLMAN3DIR = /opt/local/share/man/man3 +INSTALLMAN3DIR = /opt/local/share/man/man3p DESTINSTALLMAN3DIR = $(DESTDIR)$(INSTALLMAN3DIR) INSTALLSITEMAN3DIR = /opt/local/share/man/man3 DESTINSTALLSITEMAN3DIR = $(DESTDIR)$(INSTALLSITEMAN3DIR) INSTALLVENDORMAN3DIR = /opt/local/share/man/man3 DESTINSTALLVENDORMAN3DIR = $(DESTDIR)$(INSTALLVENDORMAN3DIR) PERL_LIB = /opt/local/lib/perl5/5.10.1 -PERL_ARCHLIB = /opt/local/lib/perl5/5.10.1/darwin-2level +PERL_ARCHLIB = /opt/local/lib/perl5/5.10.1/darwin-thread-multi-2level LIBPERL_A = libperl.a FIRST_MAKEFILE = Makefile MAKEFILE_OLD = Makefile.old MAKE_APERL_FILE = Makefile.aperl PERLMAINCC = $(CC) -PERL_INC = /opt/local/lib/perl5/5.10.1/darwin-2level/CORE +PERL_INC = /opt/local/lib/perl5/5.10.1/darwin-thread-multi-2level/CORE PERL = /opt/local/bin/perl FULLPERL = /opt/local/bin/perl ABSPERL = $(PERL) @@ -137,8 +137,8 @@ PERM_RW = 644 PERM_RWX = 755 MAKEMAKER = /opt/local/lib/perl5/5.10.1/ExtUtils/MakeMaker.pm -MM_VERSION = 6.58 -MM_REVISION = 65800 +MM_VERSION = 6.62 +MM_REVISION = 66200 # FULLEXT = Pathname for extension directory (eg Foo/Bar/Oracle). # BASEEXT = Basename part of FULLEXT. May be just equal FULLEXT. (eg Oracle) @@ -205,7 +205,7 @@ PM_TO_BLIB = lib/SQL/Bibliosoph/Dummy.pm \ # --- MakeMaker platform_constants section: -MM_Unix_VERSION = 6.58 +MM_Unix_VERSION = 6.62 PERL_MALLOC_DEF = -DPERL_EXTMALLOC_DEF -Dmalloc=Perl_malloc -Dfree=Perl_mfree -Drealloc=Perl_realloc -Dcalloc=Perl_calloc @@ -270,7 +270,7 @@ RCS_LABEL = rcs -Nv$(VERSION_SYM): -q DIST_CP = best DIST_DEFAULT = tardist DISTNAME = SQL-Bibliosoph -DISTVNAME = SQL-Bibliosoph-2.45 +DISTVNAME = SQL-Bibliosoph-2.46 # --- MakeMaker macro section: @@ -494,8 +494,100 @@ realclean purge :: clean realclean_subdirs # --- MakeMaker metafile section: -metafile : - $(NOECHO) $(NOOP) +metafile : create_distdir + $(NOECHO) $(ECHO) Generating META.yml + $(NOECHO) $(ECHO) '---' > META_new.yml + $(NOECHO) $(ECHO) 'abstract: '\''A SQL Query library'\''' >> META_new.yml + $(NOECHO) $(ECHO) 'author:' >> META_new.yml + $(NOECHO) $(ECHO) ' - '\''Matias Alejo Garcia ( matiu@cpan.org ) '\''' >> META_new.yml + $(NOECHO) $(ECHO) 'build_requires:' >> META_new.yml + $(NOECHO) $(ECHO) ' ExtUtils::MakeMaker: 0' >> META_new.yml + $(NOECHO) $(ECHO) 'configure_requires:' >> META_new.yml + $(NOECHO) $(ECHO) ' ExtUtils::MakeMaker: 0' >> META_new.yml + $(NOECHO) $(ECHO) 'dynamic_config: 1' >> META_new.yml + $(NOECHO) $(ECHO) 'generated_by: '\''ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.120921'\''' >> META_new.yml + $(NOECHO) $(ECHO) 'license: unknown' >> META_new.yml + $(NOECHO) $(ECHO) 'meta-spec:' >> META_new.yml + $(NOECHO) $(ECHO) ' url: http://module-build.sourceforge.net/META-spec-v1.4.html' >> META_new.yml + $(NOECHO) $(ECHO) ' version: 1.4' >> META_new.yml + $(NOECHO) $(ECHO) 'name: SQL-Bibliosoph' >> META_new.yml + $(NOECHO) $(ECHO) 'no_index:' >> META_new.yml + $(NOECHO) $(ECHO) ' directory:' >> META_new.yml + $(NOECHO) $(ECHO) ' - t' >> META_new.yml + $(NOECHO) $(ECHO) ' - inc' >> META_new.yml + $(NOECHO) $(ECHO) 'requires:' >> META_new.yml + $(NOECHO) $(ECHO) ' Cache::Memcached::Fast: 0.17' >> META_new.yml + $(NOECHO) $(ECHO) ' Carp: 1.25' >> META_new.yml + $(NOECHO) $(ECHO) ' DBD::Mock: 1.43' >> META_new.yml + $(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) ' Moose: 0.82' >> META_new.yml + $(NOECHO) $(ECHO) ' Package::Constants: 0.02' >> META_new.yml + $(NOECHO) $(ECHO) ' Storable: 2.3' >> META_new.yml + $(NOECHO) $(ECHO) ' Test::More: 0.88' >> META_new.yml + $(NOECHO) $(ECHO) ' Tie::Array::Random: 1' >> META_new.yml + $(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) $(MV) META_new.yml $(DISTVNAME)/META.yml + $(NOECHO) $(ECHO) Generating META.json + $(NOECHO) $(ECHO) '{' > META_new.json + $(NOECHO) $(ECHO) ' "abstract" : "A SQL Query library",' >> META_new.json + $(NOECHO) $(ECHO) ' "author" : [' >> META_new.json + $(NOECHO) $(ECHO) ' "Matias Alejo Garcia ( matiu@cpan.org ) "' >> META_new.json + $(NOECHO) $(ECHO) ' ],' >> META_new.json + $(NOECHO) $(ECHO) ' "dynamic_config" : 1,' >> META_new.json + $(NOECHO) $(ECHO) ' "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.120921",' >> META_new.json + $(NOECHO) $(ECHO) ' "license" : [' >> META_new.json + $(NOECHO) $(ECHO) ' "unknown"' >> META_new.json + $(NOECHO) $(ECHO) ' ],' >> META_new.json + $(NOECHO) $(ECHO) ' "meta-spec" : {' >> META_new.json + $(NOECHO) $(ECHO) ' "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",' >> META_new.json + $(NOECHO) $(ECHO) ' "version" : "2"' >> META_new.json + $(NOECHO) $(ECHO) ' },' >> META_new.json + $(NOECHO) $(ECHO) ' "name" : "SQL-Bibliosoph",' >> META_new.json + $(NOECHO) $(ECHO) ' "no_index" : {' >> META_new.json + $(NOECHO) $(ECHO) ' "directory" : [' >> META_new.json + $(NOECHO) $(ECHO) ' "t",' >> META_new.json + $(NOECHO) $(ECHO) ' "inc"' >> META_new.json + $(NOECHO) $(ECHO) ' ]' >> META_new.json + $(NOECHO) $(ECHO) ' },' >> META_new.json + $(NOECHO) $(ECHO) ' "prereqs" : {' >> META_new.json + $(NOECHO) $(ECHO) ' "build" : {' >> META_new.json + $(NOECHO) $(ECHO) ' "requires" : {' >> META_new.json + $(NOECHO) $(ECHO) ' "ExtUtils::MakeMaker" : "0"' >> META_new.json + $(NOECHO) $(ECHO) ' }' >> META_new.json + $(NOECHO) $(ECHO) ' },' >> META_new.json + $(NOECHO) $(ECHO) ' "configure" : {' >> META_new.json + $(NOECHO) $(ECHO) ' "requires" : {' >> META_new.json + $(NOECHO) $(ECHO) ' "ExtUtils::MakeMaker" : "0"' >> META_new.json + $(NOECHO) $(ECHO) ' }' >> META_new.json + $(NOECHO) $(ECHO) ' },' >> META_new.json + $(NOECHO) $(ECHO) ' "runtime" : {' >> META_new.json + $(NOECHO) $(ECHO) ' "requires" : {' >> META_new.json + $(NOECHO) $(ECHO) ' "Cache::Memcached::Fast" : "0.17",' >> META_new.json + $(NOECHO) $(ECHO) ' "Carp" : "1.25",' >> META_new.json + $(NOECHO) $(ECHO) ' "DBD::Mock" : "1.43",' >> META_new.json + $(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) ' "Moose" : "0.82",' >> META_new.json + $(NOECHO) $(ECHO) ' "Package::Constants" : "0.02",' >> META_new.json + $(NOECHO) $(ECHO) ' "Storable" : "2.3",' >> META_new.json + $(NOECHO) $(ECHO) ' "Test::More" : "0.88",' >> META_new.json + $(NOECHO) $(ECHO) ' "Tie::Array::Random" : "1",' >> META_new.json + $(NOECHO) $(ECHO) ' "Tie::Hash::Random" : "1",' >> META_new.json + $(NOECHO) $(ECHO) ' "Time::HiRes" : "1.97",' >> META_new.json + $(NOECHO) $(ECHO) ' "perl" : "5.010000"' >> META_new.json + $(NOECHO) $(ECHO) ' }' >> META_new.json + $(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) '}' >> META_new.json + -$(NOECHO) $(MV) META_new.json $(DISTVNAME)/META.json # --- MakeMaker signature section: @@ -789,26 +881,25 @@ testdb_static :: testdb_dynamic # --- MakeMaker ppd section: # Creates a PPD (Perl Package Description) for a binary distribution. ppd : - $(NOECHO) $(ECHO) '' > $(DISTNAME).ppd + $(NOECHO) $(ECHO) '' > $(DISTNAME).ppd $(NOECHO) $(ECHO) ' A SQL Query library' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' Matias Alejo Garcia ( matiu@cpan.org ) ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd - $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd - $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd + $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd + $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd - $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd - $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd - $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd + $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd + $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd - $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd - $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd + $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd + $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) '' >> $(DISTNAME).ppd diff --git a/Makefile.PL b/Makefile.PL index b00c4ce..3fd3c30 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,6 +1,6 @@ use ExtUtils::MakeMaker; -use 5.10.0; +use 5.10.1; WriteMakefile( NAME => 'SQL::Bibliosoph', @@ -14,14 +14,13 @@ WriteMakefile( 'Tie::Array::Random'=> 1.0, 'Tie::Hash::Random' => 1.0, 'Moose' => 0.82, - 'DBD::Mock' => undef, - 'Time::HiRes' => undef, - 'Carp' => undef, - 'Package::Constants'=> undef, - 'Devel::Cover' => undef, + 'DBD::Mock' => 1.43, + 'Time::HiRes' => 1.97, + 'Carp' => 1.25, + 'Package::Constants'=> 0.02, 'Digest::MD5' => 2.39, 'Cache::Memcached::Fast' => 0.17, - 'Storable' => undef, + 'Storable' => 2.30, }, MIN_PERL_VERSION => '5.10.0', ); diff --git a/lib/SQL/Bibliosoph.pm b/lib/SQL/Bibliosoph.pm index 79f3d95..9de68c2 100644 --- a/lib/SQL/Bibliosoph.pm +++ b/lib/SQL/Bibliosoph.pm @@ -10,7 +10,7 @@ package SQL::Bibliosoph; { use SQL::Bibliosoph::Query; use SQL::Bibliosoph::CatalogFile; - our $VERSION = "2.46"; + our $VERSION = "2.47"; has 'dbh' => ( is => 'ro', isa => 'DBI::db', required=> 1); @@ -33,7 +33,7 @@ package SQL::Bibliosoph; { sub d { my $self = shift; - print STDERR join (' ', map { $_ // 'NULL' } @_ ) if $self->debug(); + print STDERR join (':', map { $_ // 'NULL' } @_ ) if $self->debug(); } #------------------------------------------------------------------ From 9b52619cc5dea2a522e0211e7b7b0e8fc3f76f2c Mon Sep 17 00:00:00 2001 From: matias alejo garcia Date: Sat, 6 Oct 2012 13:13:10 -0300 Subject: [PATCH 2/9] better logs --- Makefile | 14 +-- Makefile.old | 204 +++++++++++++++++++++++++++--------------- lib/SQL/Bibliosoph.pm | 10 +-- 3 files changed, 144 insertions(+), 84 deletions(-) diff --git a/Makefile b/Makefile index ea125d9..a48db1e 100644 --- a/Makefile +++ b/Makefile @@ -57,11 +57,11 @@ DIRFILESEP = / DFSEP = $(DIRFILESEP) NAME = SQL::Bibliosoph NAME_SYM = SQL_Bibliosoph -VERSION = 2.46 +VERSION = 2.47 VERSION_MACRO = VERSION -VERSION_SYM = 2_46 +VERSION_SYM = 2_47 DEFINE_VERSION = -D$(VERSION_MACRO)=\"$(VERSION)\" -XS_VERSION = 2.46 +XS_VERSION = 2.47 XS_VERSION_MACRO = XS_VERSION XS_DEFINE_VERSION = -D$(XS_VERSION_MACRO)=\"$(XS_VERSION)\" INST_ARCHLIB = blib/arch @@ -270,7 +270,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.47 # --- MakeMaker macro section: @@ -530,7 +530,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.47' >> META_new.yml -$(NOECHO) $(MV) META_new.yml $(DISTVNAME)/META.yml $(NOECHO) $(ECHO) Generating META.json $(NOECHO) $(ECHO) '{' > META_new.json @@ -585,7 +585,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.47"' >> META_new.json $(NOECHO) $(ECHO) '}' >> META_new.json -$(NOECHO) $(MV) META_new.json $(DISTVNAME)/META.json @@ -881,7 +881,7 @@ testdb_static :: testdb_dynamic # --- MakeMaker ppd section: # Creates a PPD (Perl Package Description) for a binary distribution. ppd : - $(NOECHO) $(ECHO) '' > $(DISTNAME).ppd + $(NOECHO) $(ECHO) '' > $(DISTNAME).ppd $(NOECHO) $(ECHO) ' A SQL Query library' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' Matias Alejo Garcia ( matiu@cpan.org ) ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd diff --git a/Makefile.old b/Makefile.old index a8ae40c..ea125d9 100644 --- a/Makefile.old +++ b/Makefile.old @@ -1,7 +1,7 @@ # This Makefile is for the SQL::Bibliosoph extension to perl. # # It was generated automatically by MakeMaker version -# 6.55_02 (Revision: 65502) from the contents of +# 6.62 (Revision: 66200) from the contents of # Makefile.PL. Don't edit this file, edit Makefile.PL instead. # # ANY CHANGES MADE HERE WILL BE LOST! @@ -12,11 +12,12 @@ # MakeMaker Parameters: # ABSTRACT => q[A SQL Query library] -# AUTHOR => q[Matias Alejo Garcia ( matiu@cpan.org ) ] +# AUTHOR => [q[Matias Alejo Garcia ( matiu@cpan.org ) ]] # BUILD_REQUIRES => { } +# CONFIGURE_REQUIRES => { } # MIN_PERL_VERSION => q[5.010000] # NAME => q[SQL::Bibliosoph] -# PREREQ_PM => { DBD::Mock=>undef, Package::Constants=>undef, Tie::Hash::Random=>q[1], Storable=>undef, Time::HiRes=>undef, Carp=>undef, Test::More=>q[0.88], DBD::mysql=>q[4.004], Digest::MD5=>q[2.39], Cache::Memcached::Fast=>q[0.17], Devel::Cover=>undef, 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], 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] } # VERSION_FROM => q[lib/SQL/Bibliosoph.pm] # --- MakeMaker post_initialize section: @@ -24,29 +25,29 @@ # --- MakeMaker const_config section: -# These definitions are from config.sh (via /opt/local/lib/perl5/5.10.1/darwin-2level/Config.pm). +# These definitions are from config.sh (via /opt/local/lib/perl5/5.10.1/darwin-thread-multi-2level/Config.pm). # They may have been overridden via Makefile.PL or on the command line. AR = ar -CC = /usr/bin/gcc-4.2 +CC = /usr/bin/clang CCCDLFLAGS = CCDLFLAGS = DLEXT = bundle DLSRC = dl_dlopen.xs EXE_EXT = FULL_AR = /usr/bin/ar -LD = env MACOSX_DEPLOYMENT_TARGET=10.3 cc -LDDLFLAGS = -L/opt/local/lib -bundle -undefined dynamic_lookup -fstack-protector -LDFLAGS = -L/opt/local/lib -fstack-protector -LIBC = /usr/lib/libc.dylib +LD = env MACOSX_DEPLOYMENT_TARGET=10.3 /usr/bin/clang +LDDLFLAGS = -L/opt/local/lib -bundle -undefined dynamic_lookup -fstack-protector +LDFLAGS = -L/opt/local/lib -fstack-protector +LIBC = LIB_EXT = .a OBJ_EXT = .o OSNAME = darwin -OSVERS = 10.2.0 +OSVERS = 11.3.0 RANLIB = ranlib SITELIBEXP = /opt/local/lib/perl5/site_perl/5.10.1 -SITEARCHEXP = /opt/local/lib/perl5/site_perl/5.10.1/darwin-2level +SITEARCHEXP = /opt/local/lib/perl5/site_perl/5.10.1/darwin-thread-multi-2level SO = dylib -VENDORARCHEXP = /opt/local/lib/perl5/vendor_perl/5.10.1/darwin-2level +VENDORARCHEXP = /opt/local/lib/perl5/vendor_perl/5.10.1/darwin-thread-multi-2level VENDORLIBEXP = /opt/local/lib/perl5/vendor_perl/5.10.1 @@ -56,11 +57,11 @@ DIRFILESEP = / DFSEP = $(DIRFILESEP) NAME = SQL::Bibliosoph NAME_SYM = SQL_Bibliosoph -VERSION = 2.30 +VERSION = 2.46 VERSION_MACRO = VERSION -VERSION_SYM = 2_30 +VERSION_SYM = 2_46 DEFINE_VERSION = -D$(VERSION_MACRO)=\"$(VERSION)\" -XS_VERSION = 2.30 +XS_VERSION = 2.46 XS_VERSION_MACRO = XS_VERSION XS_DEFINE_VERSION = -D$(XS_VERSION_MACRO)=\"$(XS_VERSION)\" INST_ARCHLIB = blib/arch @@ -69,8 +70,8 @@ INST_BIN = blib/bin INST_LIB = blib/lib INST_MAN1DIR = blib/man1 INST_MAN3DIR = blib/man3 -MAN1EXT = 1 -MAN3EXT = 3 +MAN1EXT = 1pm +MAN3EXT = 3pm INSTALLDIRS = site DESTDIR = PREFIX = $(SITEPREFIX) @@ -83,11 +84,11 @@ INSTALLSITELIB = /opt/local/lib/perl5/site_perl/5.10.1 DESTINSTALLSITELIB = $(DESTDIR)$(INSTALLSITELIB) INSTALLVENDORLIB = /opt/local/lib/perl5/vendor_perl/5.10.1 DESTINSTALLVENDORLIB = $(DESTDIR)$(INSTALLVENDORLIB) -INSTALLARCHLIB = /opt/local/lib/perl5/5.10.1/darwin-2level +INSTALLARCHLIB = /opt/local/lib/perl5/5.10.1/darwin-thread-multi-2level DESTINSTALLARCHLIB = $(DESTDIR)$(INSTALLARCHLIB) -INSTALLSITEARCH = /opt/local/lib/perl5/site_perl/5.10.1/darwin-2level +INSTALLSITEARCH = /opt/local/lib/perl5/site_perl/5.10.1/darwin-thread-multi-2level DESTINSTALLSITEARCH = $(DESTDIR)$(INSTALLSITEARCH) -INSTALLVENDORARCH = /opt/local/lib/perl5/vendor_perl/5.10.1/darwin-2level +INSTALLVENDORARCH = /opt/local/lib/perl5/vendor_perl/5.10.1/darwin-thread-multi-2level DESTINSTALLVENDORARCH = $(DESTDIR)$(INSTALLVENDORARCH) INSTALLBIN = /opt/local/bin DESTINSTALLBIN = $(DESTDIR)$(INSTALLBIN) @@ -101,26 +102,26 @@ INSTALLSITESCRIPT = /opt/local/bin DESTINSTALLSITESCRIPT = $(DESTDIR)$(INSTALLSITESCRIPT) INSTALLVENDORSCRIPT = /opt/local/bin DESTINSTALLVENDORSCRIPT = $(DESTDIR)$(INSTALLVENDORSCRIPT) -INSTALLMAN1DIR = /opt/local/share/man/man1 +INSTALLMAN1DIR = /opt/local/share/man/man1p DESTINSTALLMAN1DIR = $(DESTDIR)$(INSTALLMAN1DIR) INSTALLSITEMAN1DIR = /opt/local/share/man/man1 DESTINSTALLSITEMAN1DIR = $(DESTDIR)$(INSTALLSITEMAN1DIR) INSTALLVENDORMAN1DIR = /opt/local/share/man/man1 DESTINSTALLVENDORMAN1DIR = $(DESTDIR)$(INSTALLVENDORMAN1DIR) -INSTALLMAN3DIR = /opt/local/share/man/man3 +INSTALLMAN3DIR = /opt/local/share/man/man3p DESTINSTALLMAN3DIR = $(DESTDIR)$(INSTALLMAN3DIR) INSTALLSITEMAN3DIR = /opt/local/share/man/man3 DESTINSTALLSITEMAN3DIR = $(DESTDIR)$(INSTALLSITEMAN3DIR) INSTALLVENDORMAN3DIR = /opt/local/share/man/man3 DESTINSTALLVENDORMAN3DIR = $(DESTDIR)$(INSTALLVENDORMAN3DIR) PERL_LIB = /opt/local/lib/perl5/5.10.1 -PERL_ARCHLIB = /opt/local/lib/perl5/5.10.1/darwin-2level +PERL_ARCHLIB = /opt/local/lib/perl5/5.10.1/darwin-thread-multi-2level LIBPERL_A = libperl.a FIRST_MAKEFILE = Makefile MAKEFILE_OLD = Makefile.old MAKE_APERL_FILE = Makefile.aperl PERLMAINCC = $(CC) -PERL_INC = /opt/local/lib/perl5/5.10.1/darwin-2level/CORE +PERL_INC = /opt/local/lib/perl5/5.10.1/darwin-thread-multi-2level/CORE PERL = /opt/local/bin/perl FULLPERL = /opt/local/bin/perl ABSPERL = $(PERL) @@ -136,8 +137,8 @@ PERM_RW = 644 PERM_RWX = 755 MAKEMAKER = /opt/local/lib/perl5/5.10.1/ExtUtils/MakeMaker.pm -MM_VERSION = 6.55_02 -MM_REVISION = 65502 +MM_VERSION = 6.62 +MM_REVISION = 66200 # FULLEXT = Pathname for extension directory (eg Foo/Bar/Oracle). # BASEEXT = Basename part of FULLEXT. May be just equal FULLEXT. (eg Oracle) @@ -204,7 +205,7 @@ PM_TO_BLIB = lib/SQL/Bibliosoph/Dummy.pm \ # --- MakeMaker platform_constants section: -MM_Unix_VERSION = 6.55_02 +MM_Unix_VERSION = 6.62 PERL_MALLOC_DEF = -DPERL_EXTMALLOC_DEF -Dmalloc=Perl_malloc -Dfree=Perl_mfree -Drealloc=Perl_realloc -Dcalloc=Perl_calloc @@ -269,7 +270,7 @@ RCS_LABEL = rcs -Nv$(VERSION_SYM): -q DIST_CP = best DIST_DEFAULT = tardist DISTNAME = SQL-Bibliosoph -DISTVNAME = SQL-Bibliosoph-2.30 +DISTVNAME = SQL-Bibliosoph-2.46 # --- MakeMaker macro section: @@ -460,14 +461,15 @@ clean :: clean_subdirs *$(LIB_EXT) core \ core.[0-9] $(INST_ARCHAUTODIR)/extralibs.all \ core.[0-9][0-9] $(BASEEXT).bso \ - pm_to_blib.ts core.[0-9][0-9][0-9][0-9] \ + pm_to_blib.ts MYMETA.json \ + core.[0-9][0-9][0-9][0-9] MYMETA.yml \ $(BASEEXT).x $(BOOTSTRAP) \ perl$(EXE_EXT) tmon.out \ *$(OBJ_EXT) pm_to_blib \ $(INST_ARCHAUTODIR)/extralibs.ld blibdirs.ts \ core.[0-9][0-9][0-9][0-9][0-9] *perl.core \ core.*perl.*.? $(MAKE_APERL_FILE) \ - perl $(BASEEXT).def \ + $(BASEEXT).def perl \ core.[0-9][0-9][0-9] mon.out \ lib$(BASEEXT).def perlmain.c \ perl.exe so_locations \ @@ -494,43 +496,98 @@ realclean purge :: clean realclean_subdirs # --- MakeMaker metafile section: metafile : create_distdir $(NOECHO) $(ECHO) Generating META.yml - $(NOECHO) $(ECHO) '--- #YAML:1.0' > META_new.yml - $(NOECHO) $(ECHO) 'name: SQL-Bibliosoph' >> META_new.yml - $(NOECHO) $(ECHO) 'version: 2.30' >> META_new.yml - $(NOECHO) $(ECHO) 'abstract: A SQL Query library' >> META_new.yml + $(NOECHO) $(ECHO) '---' > META_new.yml + $(NOECHO) $(ECHO) 'abstract: '\''A SQL Query library'\''' >> META_new.yml $(NOECHO) $(ECHO) 'author:' >> META_new.yml - $(NOECHO) $(ECHO) ' - Matias Alejo Garcia ( matiu@cpan.org ) ' >> META_new.yml - $(NOECHO) $(ECHO) 'license: unknown' >> META_new.yml - $(NOECHO) $(ECHO) 'distribution_type: module' >> META_new.yml - $(NOECHO) $(ECHO) 'configure_requires:' >> META_new.yml - $(NOECHO) $(ECHO) ' ExtUtils::MakeMaker: 0' >> META_new.yml + $(NOECHO) $(ECHO) ' - '\''Matias Alejo Garcia ( matiu@cpan.org ) '\''' >> META_new.yml $(NOECHO) $(ECHO) 'build_requires:' >> META_new.yml - $(NOECHO) $(ECHO) ' ExtUtils::MakeMaker: 0' >> META_new.yml - $(NOECHO) $(ECHO) 'requires:' >> META_new.yml - $(NOECHO) $(ECHO) ' Cache::Memcached::Fast: 0.17' >> META_new.yml - $(NOECHO) $(ECHO) ' Carp: ~' >> META_new.yml - $(NOECHO) $(ECHO) ' DBD::Mock: ~' >> META_new.yml - $(NOECHO) $(ECHO) ' DBD::mysql: 4.004' >> META_new.yml - $(NOECHO) $(ECHO) ' DBI: 1.5' >> META_new.yml - $(NOECHO) $(ECHO) ' Devel::Cover: ~' >> META_new.yml - $(NOECHO) $(ECHO) ' Digest::MD5: 2.39' >> META_new.yml - $(NOECHO) $(ECHO) ' Moose: 0.82' >> META_new.yml - $(NOECHO) $(ECHO) ' Package::Constants: ~' >> META_new.yml - $(NOECHO) $(ECHO) ' perl: 5.010000' >> META_new.yml - $(NOECHO) $(ECHO) ' Storable: ~' >> META_new.yml - $(NOECHO) $(ECHO) ' Test::More: 0.88' >> META_new.yml - $(NOECHO) $(ECHO) ' Tie::Array::Random: 1' >> META_new.yml - $(NOECHO) $(ECHO) ' Tie::Hash::Random: 1' >> META_new.yml - $(NOECHO) $(ECHO) ' Time::HiRes: ~' >> META_new.yml - $(NOECHO) $(ECHO) 'no_index:' >> META_new.yml - $(NOECHO) $(ECHO) ' directory:' >> META_new.yml - $(NOECHO) $(ECHO) ' - t' >> META_new.yml - $(NOECHO) $(ECHO) ' - inc' >> META_new.yml - $(NOECHO) $(ECHO) 'generated_by: ExtUtils::MakeMaker version 6.55_02' >> META_new.yml + $(NOECHO) $(ECHO) ' ExtUtils::MakeMaker: 0' >> META_new.yml + $(NOECHO) $(ECHO) 'configure_requires:' >> META_new.yml + $(NOECHO) $(ECHO) ' ExtUtils::MakeMaker: 0' >> META_new.yml + $(NOECHO) $(ECHO) 'dynamic_config: 1' >> META_new.yml + $(NOECHO) $(ECHO) 'generated_by: '\''ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.120921'\''' >> META_new.yml + $(NOECHO) $(ECHO) 'license: unknown' >> META_new.yml $(NOECHO) $(ECHO) 'meta-spec:' >> META_new.yml - $(NOECHO) $(ECHO) ' url: http://module-build.sourceforge.net/META-spec-v1.4.html' >> META_new.yml - $(NOECHO) $(ECHO) ' version: 1.4' >> META_new.yml + $(NOECHO) $(ECHO) ' url: http://module-build.sourceforge.net/META-spec-v1.4.html' >> META_new.yml + $(NOECHO) $(ECHO) ' version: 1.4' >> META_new.yml + $(NOECHO) $(ECHO) 'name: SQL-Bibliosoph' >> META_new.yml + $(NOECHO) $(ECHO) 'no_index:' >> META_new.yml + $(NOECHO) $(ECHO) ' directory:' >> META_new.yml + $(NOECHO) $(ECHO) ' - t' >> META_new.yml + $(NOECHO) $(ECHO) ' - inc' >> META_new.yml + $(NOECHO) $(ECHO) 'requires:' >> META_new.yml + $(NOECHO) $(ECHO) ' Cache::Memcached::Fast: 0.17' >> META_new.yml + $(NOECHO) $(ECHO) ' Carp: 1.25' >> META_new.yml + $(NOECHO) $(ECHO) ' DBD::Mock: 1.43' >> META_new.yml + $(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) ' Moose: 0.82' >> META_new.yml + $(NOECHO) $(ECHO) ' Package::Constants: 0.02' >> META_new.yml + $(NOECHO) $(ECHO) ' Storable: 2.3' >> META_new.yml + $(NOECHO) $(ECHO) ' Test::More: 0.88' >> META_new.yml + $(NOECHO) $(ECHO) ' Tie::Array::Random: 1' >> META_new.yml + $(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) $(MV) META_new.yml $(DISTVNAME)/META.yml + $(NOECHO) $(ECHO) Generating META.json + $(NOECHO) $(ECHO) '{' > META_new.json + $(NOECHO) $(ECHO) ' "abstract" : "A SQL Query library",' >> META_new.json + $(NOECHO) $(ECHO) ' "author" : [' >> META_new.json + $(NOECHO) $(ECHO) ' "Matias Alejo Garcia ( matiu@cpan.org ) "' >> META_new.json + $(NOECHO) $(ECHO) ' ],' >> META_new.json + $(NOECHO) $(ECHO) ' "dynamic_config" : 1,' >> META_new.json + $(NOECHO) $(ECHO) ' "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.120921",' >> META_new.json + $(NOECHO) $(ECHO) ' "license" : [' >> META_new.json + $(NOECHO) $(ECHO) ' "unknown"' >> META_new.json + $(NOECHO) $(ECHO) ' ],' >> META_new.json + $(NOECHO) $(ECHO) ' "meta-spec" : {' >> META_new.json + $(NOECHO) $(ECHO) ' "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",' >> META_new.json + $(NOECHO) $(ECHO) ' "version" : "2"' >> META_new.json + $(NOECHO) $(ECHO) ' },' >> META_new.json + $(NOECHO) $(ECHO) ' "name" : "SQL-Bibliosoph",' >> META_new.json + $(NOECHO) $(ECHO) ' "no_index" : {' >> META_new.json + $(NOECHO) $(ECHO) ' "directory" : [' >> META_new.json + $(NOECHO) $(ECHO) ' "t",' >> META_new.json + $(NOECHO) $(ECHO) ' "inc"' >> META_new.json + $(NOECHO) $(ECHO) ' ]' >> META_new.json + $(NOECHO) $(ECHO) ' },' >> META_new.json + $(NOECHO) $(ECHO) ' "prereqs" : {' >> META_new.json + $(NOECHO) $(ECHO) ' "build" : {' >> META_new.json + $(NOECHO) $(ECHO) ' "requires" : {' >> META_new.json + $(NOECHO) $(ECHO) ' "ExtUtils::MakeMaker" : "0"' >> META_new.json + $(NOECHO) $(ECHO) ' }' >> META_new.json + $(NOECHO) $(ECHO) ' },' >> META_new.json + $(NOECHO) $(ECHO) ' "configure" : {' >> META_new.json + $(NOECHO) $(ECHO) ' "requires" : {' >> META_new.json + $(NOECHO) $(ECHO) ' "ExtUtils::MakeMaker" : "0"' >> META_new.json + $(NOECHO) $(ECHO) ' }' >> META_new.json + $(NOECHO) $(ECHO) ' },' >> META_new.json + $(NOECHO) $(ECHO) ' "runtime" : {' >> META_new.json + $(NOECHO) $(ECHO) ' "requires" : {' >> META_new.json + $(NOECHO) $(ECHO) ' "Cache::Memcached::Fast" : "0.17",' >> META_new.json + $(NOECHO) $(ECHO) ' "Carp" : "1.25",' >> META_new.json + $(NOECHO) $(ECHO) ' "DBD::Mock" : "1.43",' >> META_new.json + $(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) ' "Moose" : "0.82",' >> META_new.json + $(NOECHO) $(ECHO) ' "Package::Constants" : "0.02",' >> META_new.json + $(NOECHO) $(ECHO) ' "Storable" : "2.3",' >> META_new.json + $(NOECHO) $(ECHO) ' "Test::More" : "0.88",' >> META_new.json + $(NOECHO) $(ECHO) ' "Tie::Array::Random" : "1",' >> META_new.json + $(NOECHO) $(ECHO) ' "Tie::Hash::Random" : "1",' >> META_new.json + $(NOECHO) $(ECHO) ' "Time::HiRes" : "1.97",' >> META_new.json + $(NOECHO) $(ECHO) ' "perl" : "5.010000"' >> META_new.json + $(NOECHO) $(ECHO) ' }' >> META_new.json + $(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) '}' >> META_new.json + -$(NOECHO) $(MV) META_new.json $(DISTVNAME)/META.json # --- MakeMaker signature section: @@ -622,8 +679,12 @@ ci : # --- MakeMaker distmeta section: distmeta : create_distdir metafile - $(NOECHO) cd $(DISTVNAME) && $(ABSPERLRUN) -MExtUtils::Manifest=maniadd -e 'eval { maniadd({q{META.yml} => q{Module meta-data (added by MakeMaker)}}) } ' \ + $(NOECHO) cd $(DISTVNAME) && $(ABSPERLRUN) -MExtUtils::Manifest=maniadd -e 'exit unless -e q{META.yml};' \ + -e 'eval { maniadd({q{META.yml} => q{Module YAML meta-data (added by MakeMaker)}}) }' \ -e ' or print "Could not add META.yml to MANIFEST: $${'\''@'\''}\n"' -- + $(NOECHO) cd $(DISTVNAME) && $(ABSPERLRUN) -MExtUtils::Manifest=maniadd -e 'exit unless -f q{META.json};' \ + -e 'eval { maniadd({q{META.json} => q{Module JSON meta-data (added by MakeMaker)}}) }' \ + -e ' or print "Could not add META.json to MANIFEST: $${'\''@'\''}\n"' -- @@ -820,26 +881,25 @@ testdb_static :: testdb_dynamic # --- MakeMaker ppd section: # Creates a PPD (Perl Package Description) for a binary distribution. ppd : - $(NOECHO) $(ECHO) '' > $(DISTNAME).ppd + $(NOECHO) $(ECHO) '' > $(DISTNAME).ppd $(NOECHO) $(ECHO) ' A SQL Query library' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' Matias Alejo Garcia ( matiu@cpan.org ) ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd - $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd - $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd + $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd + $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd - $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd - $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd - $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd + $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd + $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd - $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd - $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd + $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd + $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) '' >> $(DISTNAME).ppd diff --git a/lib/SQL/Bibliosoph.pm b/lib/SQL/Bibliosoph.pm index 272d3aa..146e59a 100644 --- a/lib/SQL/Bibliosoph.pm +++ b/lib/SQL/Bibliosoph.pm @@ -221,7 +221,7 @@ package SQL::Bibliosoph; { # Many *$name = sub { my ($that) = shift; - $self->d('many ',$name,@_); + $self->d('Q ',$name,@_); return $self->queries()->{$name}->select_many([@_]); }; @@ -230,7 +230,7 @@ package SQL::Bibliosoph; { # Many *$name_row = sub { my ($that) = shift; - $self->d('manyh ',$name,@_); + $self->d('Q ',$name_row,@_); return $self->queries()->{$name}->select_many([@_],{}); }; @@ -239,7 +239,7 @@ package SQL::Bibliosoph; { *$name_row = sub { my ($that) = shift; - $self->d('row ',$name,@_); + $self->d('Q ',$name_row,@_); return $self->queries()->{$name}->select_row([@_]); }; @@ -248,7 +248,7 @@ package SQL::Bibliosoph; { *$name_row = sub { my ($that) = shift; - $self->d('rowh ',$name,@_); + $self->d('Q ',$name_row,@_); return $self->queries()->{$name}->select_row_hash([@_]); }; @@ -261,7 +261,7 @@ package SQL::Bibliosoph; { my $ttl; my $cfg = shift @_; - $self->d('manyCh',$name,@_); + $self->d('Q ',$name_row,@_); croak "we calling a ch_* function, first argument must be a hash_ref and must have a 'ttl' keyword" if ref ($cfg) ne 'HASH' || ! ( $ttl = $cfg->{ttl} ); From 743de895fe8e8b0099b8e932dd9bf8645e8a71f1 Mon Sep 17 00:00:00 2001 From: matias alejo garcia Date: Sat, 6 Oct 2012 13:16:22 -0300 Subject: [PATCH 3/9] better logs --- lib/SQL/Bibliosoph.pm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/SQL/Bibliosoph.pm b/lib/SQL/Bibliosoph.pm index 146e59a..fd0aef6 100644 --- a/lib/SQL/Bibliosoph.pm +++ b/lib/SQL/Bibliosoph.pm @@ -230,7 +230,7 @@ package SQL::Bibliosoph; { # Many *$name_row = sub { my ($that) = shift; - $self->d('Q ',$name_row,@_); + $self->d('Q h_',$name,@_); return $self->queries()->{$name}->select_many([@_],{}); }; @@ -239,7 +239,7 @@ package SQL::Bibliosoph; { *$name_row = sub { my ($that) = shift; - $self->d('Q ',$name_row,@_); + $self->d('Q row_',$name,@_); return $self->queries()->{$name}->select_row([@_]); }; @@ -248,7 +248,7 @@ package SQL::Bibliosoph; { *$name_row = sub { my ($that) = shift; - $self->d('Q ',$name_row,@_); + $self->d('Q rowh_',$name,@_); return $self->queries()->{$name}->select_row_hash([@_]); }; @@ -261,7 +261,7 @@ package SQL::Bibliosoph; { my $ttl; my $cfg = shift @_; - $self->d('Q ',$name_row,@_); + $self->d('Q ch_',$name,@_); croak "we calling a ch_* function, first argument must be a hash_ref and must have a 'ttl' keyword" if ref ($cfg) ne 'HASH' || ! ( $ttl = $cfg->{ttl} ); @@ -312,7 +312,7 @@ package SQL::Bibliosoph; { $name_row = $name . '_sth'; *$name_row = sub { my ($that) = shift; - $self->d('sth ', $name, @_); + $self->d('Q ', $name, @_); return $self->queries()->{$name}->select_do([@_]); }; @@ -328,7 +328,7 @@ package SQL::Bibliosoph; { # Many *$name = sub { my ($that) = shift; - $self->d('many ',$name,@_); + $self->d('Q ',$name,@_); return wantarray @@ -342,7 +342,7 @@ package SQL::Bibliosoph; { *$nameh = sub { my ($that) = shift; - $self->d('manyh ',$name,@_); + $self->d('Q h_',$name,@_); return wantarray ? $self->queries()->{$name}->select_many2([@_],{}) @@ -359,7 +359,7 @@ package SQL::Bibliosoph; { my $ttl; my $cfg = shift @_; - $self->d('manyCh',$name,@_); + $self->d('Q ch_',$name,@_); croak "we calling a ch_* function, first argument must be a hash_ref and must have a 'ttl' keyword" if ref ($cfg) ne 'HASH' || ! ( $ttl = $cfg->{ttl} ); @@ -431,7 +431,7 @@ package SQL::Bibliosoph; { # do *$name = sub { my ($that) = shift; - $self->d('inse ',$name,@_); + $self->d('Q ',$name,@_); my $ret = $self->queries() ->{$name} @@ -458,7 +458,7 @@ package SQL::Bibliosoph; { # scalar : SQL_ROWS (modified rows) *$name = sub { my ($that) = shift; - $self->d('oth ',$name,@_); + $self->d('Q ',$name,@_); return $self->queries() ->{$name} From 83c6415a055e29dc3808dc49bf90ffe658db65cb Mon Sep 17 00:00:00 2001 From: matias alejo garcia Date: Sat, 6 Oct 2012 13:18:46 -0300 Subject: [PATCH 4/9] better logs --- lib/SQL/Bibliosoph.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/SQL/Bibliosoph.pm b/lib/SQL/Bibliosoph.pm index fd0aef6..6fa4dbf 100644 --- a/lib/SQL/Bibliosoph.pm +++ b/lib/SQL/Bibliosoph.pm @@ -33,7 +33,8 @@ package SQL::Bibliosoph; { sub d { my $self = shift; - print STDERR join (':', map { $_ // 'NULL' } @_ ) if $self->debug(); + my $name = shift; + print STDERR $name.join (':', map { $_ // 'NULL' } @_ ) if $self->debug(); } #------------------------------------------------------------------ From b7e816c1276f87947bef684290577cb470c981f0 Mon Sep 17 00:00:00 2001 From: matias alejo garcia Date: Mon, 15 Oct 2012 08:16:55 -0300 Subject: [PATCH 5/9] better gitignore --- .gitignore | 2 +- Makefile | 25 ++++++++++++++++--------- Makefile.PL | 1 + Makefile.old | 25 ++++++++++++++++--------- lib/SQL/Bibliosoph.pm | 7 +++---- lib/SQL/Bibliosoph/Query.pm | 7 +++++-- t/biblio.t | 9 ++++++++- 7 files changed, 50 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 77cf9b7..408b501 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,4 @@ tags blib Makefile - +Makefile.old diff --git a/Makefile b/Makefile index a48db1e..512d685 100644 --- a/Makefile +++ b/Makefile @@ -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: @@ -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 @@ -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 \ @@ -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: @@ -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 @@ -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 @@ -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 @@ -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 @@ -881,7 +886,7 @@ testdb_static :: testdb_dynamic # --- MakeMaker ppd section: # Creates a PPD (Perl Package Description) for a binary distribution. ppd : - $(NOECHO) $(ECHO) '' > $(DISTNAME).ppd + $(NOECHO) $(ECHO) '' > $(DISTNAME).ppd $(NOECHO) $(ECHO) ' A SQL Query library' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' Matias Alejo Garcia ( matiu@cpan.org ) ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd @@ -892,6 +897,7 @@ ppd : $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd + $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd @@ -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 \ diff --git a/Makefile.PL b/Makefile.PL index 3fd3c30..11ba16d 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -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', ); diff --git a/Makefile.old b/Makefile.old index ea125d9..512d685 100644 --- a/Makefile.old +++ b/Makefile.old @@ -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: @@ -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 @@ -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 \ @@ -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: @@ -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 @@ -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 @@ -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 @@ -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 @@ -881,7 +886,7 @@ testdb_static :: testdb_dynamic # --- MakeMaker ppd section: # Creates a PPD (Perl Package Description) for a binary distribution. ppd : - $(NOECHO) $(ECHO) '' > $(DISTNAME).ppd + $(NOECHO) $(ECHO) '' > $(DISTNAME).ppd $(NOECHO) $(ECHO) ' A SQL Query library' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' Matias Alejo Garcia ( matiu@cpan.org ) ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd @@ -892,6 +897,7 @@ ppd : $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd + $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd @@ -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 \ diff --git a/lib/SQL/Bibliosoph.pm b/lib/SQL/Bibliosoph.pm index 6fa4dbf..7f6d5dc 100644 --- a/lib/SQL/Bibliosoph.pm +++ b/lib/SQL/Bibliosoph.pm @@ -1,7 +1,6 @@ package SQL::Bibliosoph; { use Moose; - use Carp; use Data::Dumper; use Digest::MD5 qw/ md5_hex /; use Cache::Memcached::Fast; @@ -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); @@ -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 diff --git a/lib/SQL/Bibliosoph/Query.pm b/lib/SQL/Bibliosoph/Query.pm index d78a087..bb518b7 100644 --- a/lib/SQL/Bibliosoph/Query.pm +++ b/lib/SQL/Bibliosoph/Query.pm @@ -7,6 +7,7 @@ package SQL::Bibliosoph::Query; { use feature qw(say); use SQL::Bibliosoph::Dummy; + use SQL::Bibliosoph::Exceptions; our $VERSION = "2.00"; @@ -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); @@ -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; diff --git a/t/biblio.t b/t/biblio.t index 76e6425..420232a 100644 --- a/t/biblio.t +++ b/t/biblio.t @@ -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 @@ -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'); @@ -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(); From a660875e9398a86224fb7535e8515246c604e44b Mon Sep 17 00:00:00 2001 From: matias alejo garcia Date: Mon, 15 Oct 2012 08:23:11 -0300 Subject: [PATCH 6/9] Exceptions instead of carp --- lib/SQL/Bibliosoph.pm | 8 ++++++-- lib/SQL/Bibliosoph/CatalogFile.pm | 10 +++++++--- lib/SQL/Bibliosoph/Query.pm | 11 ++++++----- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/lib/SQL/Bibliosoph.pm b/lib/SQL/Bibliosoph.pm index 7f6d5dc..96387a3 100644 --- a/lib/SQL/Bibliosoph.pm +++ b/lib/SQL/Bibliosoph.pm @@ -263,7 +263,9 @@ package SQL::Bibliosoph; { $self->d('Q ch_',$name,@_); - croak "we calling a ch_* function, first argument must be a hash_ref and must have a 'ttl' keyword" if ref ($cfg) ne 'HASH' || ! ( $ttl = $cfg->{ttl} ); + SQL::Bibliosoph::Exception::CallError->throw( + desc => "when calling a ch_* function, first argument must be a hash_ref and must have a 'ttl' keyword" + ) if ref ($cfg) ne 'HASH' || ! ( $ttl = $cfg->{ttl} ); if (! $self->memc() ) { $self->d("\n\tMemcached is NOT used, no server is defined"); @@ -361,7 +363,9 @@ package SQL::Bibliosoph; { $self->d('Q ch_',$name,@_); - croak "we calling a ch_* function, first argument must be a hash_ref and must have a 'ttl' keyword" if ref ($cfg) ne 'HASH' || ! ( $ttl = $cfg->{ttl} ); + SQL::Bibliosoph::Exception::CallError->throw( + desc => "when calling a ch_* function, first argument must be a hash_ref and must have a 'ttl' keyword" + ) if ref ($cfg) ne 'HASH' || ! ( $ttl = $cfg->{ttl} ); if (! $self->memc() ) { $self->d("\n\tMemcached is NOT used, no server is defined"); diff --git a/lib/SQL/Bibliosoph/CatalogFile.pm b/lib/SQL/Bibliosoph/CatalogFile.pm index a222987..a497ed8 100644 --- a/lib/SQL/Bibliosoph/CatalogFile.pm +++ b/lib/SQL/Bibliosoph/CatalogFile.pm @@ -1,9 +1,9 @@ package SQL::Bibliosoph::CatalogFile; { use Moose; use utf8; - use Carp; use Data::Dumper; use Package::Constants; + use SQL::Bibliosoph::Exceptions; our $VERSION = "2.00"; @@ -25,7 +25,9 @@ package SQL::Bibliosoph::CatalogFile; { $self->read_only(1); } - croak "File does not exists $file " if ! -e $file; + SQL::Bibliosoph::Exception::CatalogFileError->throw( + desc => "File does not exists $file " + ) if ! -e $file; } #------------------------------------------------------------------ @@ -116,7 +118,9 @@ package SQL::Bibliosoph::CatalogFile; { my $FH; open ($FH,$file) - or croak "Could not read \"".$file."\" : $!"; + or SQL::Bibliosoph::Exception::CatalogFileError->throw( + desc => "Could not read \"".$file."\" : $!" + ) if ! -e $file; my @all = <$FH>; close ($FH); diff --git a/lib/SQL/Bibliosoph/Query.pm b/lib/SQL/Bibliosoph/Query.pm index bb518b7..eb9a649 100644 --- a/lib/SQL/Bibliosoph/Query.pm +++ b/lib/SQL/Bibliosoph/Query.pm @@ -1,6 +1,5 @@ package SQL::Bibliosoph::Query; { use Moose; - use Carp; use DBI; use Data::Dumper; use Time::HiRes qw(gettimeofday tv_interval); @@ -46,7 +45,9 @@ package SQL::Bibliosoph::Query; { #say 'Preparing "' . $self->name() ; $self->sth( $self->dbh()->prepare_cached($st) ) - or croak "error preparing : $st"; + or SQL::Bibliosoph::Exception::QuerySyntaxError->throw( + desc => "error preparing : $st" + ); # Set numeric bind variables foreach (@$numeric_fields) { @@ -141,9 +142,9 @@ package SQL::Bibliosoph::Query; { } $self->bind_params($total); - croak "Bad statament use ALL numbered bind variables, or NONE, but don't mix them in $$st " - if $numbered && $numbered != $total; - + SQL::Bibliosoph::Exception::QuerySyntaxError->throw( + desc => "Bad statament use ALL numbered bind variables, or NONE, but don't mix them in $$st" + ) if $numbered && $numbered != $total; # Replaces nums $$st =~ s/\#?\d*?\?/?/g; From 31cb8e495f0ae6c8e765ab53adcd7ea26ebcf904 Mon Sep 17 00:00:00 2001 From: matias alejo garcia Date: Mon, 15 Oct 2012 09:40:09 -0300 Subject: [PATCH 7/9] Exceptions --- lib/SQL/Bibliosoph.pm | 8 ++++++++ lib/SQL/Bibliosoph/CatalogFile.pm | 4 ++-- lib/SQL/Bibliosoph/Exceptions.pm | 27 +++++++++++++++++++++++++++ lib/SQL/Bibliosoph/Query.pm | 5 ++++- 4 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 lib/SQL/Bibliosoph/Exceptions.pm diff --git a/lib/SQL/Bibliosoph.pm b/lib/SQL/Bibliosoph.pm index 96387a3..7061b81 100644 --- a/lib/SQL/Bibliosoph.pm +++ b/lib/SQL/Bibliosoph.pm @@ -720,6 +720,14 @@ printed to STDERR after each query execution, if the time is bigger that To enable debug (prints each query, and arguments, very useful during development). +=head3 throw_errors +Enable by default. Will throw SQL::Bibliosoph::Exceptions on errors. If disabled, +will print to STDERR. By default, duplicate key errors are not throwed are exception +set this variable to '2' if you want that. + + +=head3 duplicate_key + =head1 Bibliosoph n. person having deep knowledge of books. bibliognostic. diff --git a/lib/SQL/Bibliosoph/CatalogFile.pm b/lib/SQL/Bibliosoph/CatalogFile.pm index a497ed8..9186f53 100644 --- a/lib/SQL/Bibliosoph/CatalogFile.pm +++ b/lib/SQL/Bibliosoph/CatalogFile.pm @@ -119,8 +119,8 @@ package SQL::Bibliosoph::CatalogFile; { my $FH; open ($FH,$file) or SQL::Bibliosoph::Exception::CatalogFileError->throw( - desc => "Could not read \"".$file."\" : $!" - ) if ! -e $file; + desc => "Could not read \"".$file."\" : $!" + ); my @all = <$FH>; close ($FH); diff --git a/lib/SQL/Bibliosoph/Exceptions.pm b/lib/SQL/Bibliosoph/Exceptions.pm new file mode 100644 index 0000000..3616160 --- /dev/null +++ b/lib/SQL/Bibliosoph/Exceptions.pm @@ -0,0 +1,27 @@ +#=============================================================================== +# +# FILE: Exceptions.pm +# CREATED: 07/13/2008 07:00:36 AM ART +#=============================================================================== + +use strict; +use warnings; + +package SQL::Bibliosoph::Exceptions; + +use Exception::Class ( + 'SQL::Bibliosoph::Exception::QuerySyntaxError' => { + description => 'Syntax Error', + fields => [ qw(desc) ], + }, + 'SQL::Bibliosoph::Exception::CallError' => { + description => 'Function Call Error', + fields => [ qw(desc) ], + }, + 'SQL::Bibliosoph::Exception::CatalogFileError' => { + description => 'Catalog File Error', + fields => [ qw(desc) ], + }, +); + +1; diff --git a/lib/SQL/Bibliosoph/Query.pm b/lib/SQL/Bibliosoph/Query.pm index eb9a649..497b362 100644 --- a/lib/SQL/Bibliosoph/Query.pm +++ b/lib/SQL/Bibliosoph/Query.pm @@ -202,7 +202,10 @@ package SQL::Bibliosoph::Query; { . '\"' ; - if ($self->throw_errors() ) { + if ( + $self->throw_errors() == 2 + || ($self->throw_errors() == 1 && $e !~ /\sDuplicate entry\s/ ) + ) { # $sth->err and $DBI::err will be true if error was from DBI SQL::Bibliosoph::Exception::QuerySyntaxError->throw ( desc => $e, From ba336a69cfb6ba4746c12a0295247378f7907fc4 Mon Sep 17 00:00:00 2001 From: matias alejo garcia Date: Tue, 16 Oct 2012 20:27:38 -0300 Subject: [PATCH 8/9] fix manifest --- MANIFEST | 1 + Makefile | 14 +++++++------- lib/SQL/Bibliosoph.pm | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/MANIFEST b/MANIFEST index 2d3b97a..00fec06 100644 --- a/MANIFEST +++ b/MANIFEST @@ -14,3 +14,4 @@ lib/SQL/Bibliosoph/Sims.pm lib/SQL/Bibliosoph/CatalogFile.pm lib/SQL/Bibliosoph/Query.pm lib/SQL/Bibliosoph/Dummy.pm +lib/SQL/Bibliosoph/Exceptions.pm diff --git a/Makefile b/Makefile index 512d685..2e01282 100644 --- a/Makefile +++ b/Makefile @@ -57,11 +57,11 @@ DIRFILESEP = / DFSEP = $(DIRFILESEP) NAME = SQL::Bibliosoph NAME_SYM = SQL_Bibliosoph -VERSION = 2.50 +VERSION = 2.51 VERSION_MACRO = VERSION -VERSION_SYM = 2_50 +VERSION_SYM = 2_51 DEFINE_VERSION = -D$(VERSION_MACRO)=\"$(VERSION)\" -XS_VERSION = 2.50 +XS_VERSION = 2.51 XS_VERSION_MACRO = XS_VERSION XS_DEFINE_VERSION = -D$(XS_VERSION_MACRO)=\"$(XS_VERSION)\" INST_ARCHLIB = blib/arch @@ -273,7 +273,7 @@ RCS_LABEL = rcs -Nv$(VERSION_SYM): -q DIST_CP = best DIST_DEFAULT = tardist DISTNAME = SQL-Bibliosoph -DISTVNAME = SQL-Bibliosoph-2.50 +DISTVNAME = SQL-Bibliosoph-2.51 # --- MakeMaker macro section: @@ -534,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.50' >> META_new.yml + $(NOECHO) $(ECHO) 'version: 2.51' >> META_new.yml -$(NOECHO) $(MV) META_new.yml $(DISTVNAME)/META.yml $(NOECHO) $(ECHO) Generating META.json $(NOECHO) $(ECHO) '{' > META_new.json @@ -590,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.50"' >> META_new.json + $(NOECHO) $(ECHO) ' "version" : "2.51"' >> META_new.json $(NOECHO) $(ECHO) '}' >> META_new.json -$(NOECHO) $(MV) META_new.json $(DISTVNAME)/META.json @@ -886,7 +886,7 @@ testdb_static :: testdb_dynamic # --- MakeMaker ppd section: # Creates a PPD (Perl Package Description) for a binary distribution. ppd : - $(NOECHO) $(ECHO) '' > $(DISTNAME).ppd + $(NOECHO) $(ECHO) '' > $(DISTNAME).ppd $(NOECHO) $(ECHO) ' A SQL Query library' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' Matias Alejo Garcia ( matiu@cpan.org ) ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd diff --git a/lib/SQL/Bibliosoph.pm b/lib/SQL/Bibliosoph.pm index 7061b81..e70b915 100644 --- a/lib/SQL/Bibliosoph.pm +++ b/lib/SQL/Bibliosoph.pm @@ -9,7 +9,7 @@ package SQL::Bibliosoph; { use SQL::Bibliosoph::Query; use SQL::Bibliosoph::CatalogFile; - our $VERSION = "2.50"; + our $VERSION = "2.51"; has 'dbh' => ( is => 'ro', isa => 'DBI::db', required=> 1); From 0fe1f61fbd0e42635d475a0ea925f54f32cf4ece Mon Sep 17 00:00:00 2001 From: matias alejo garcia Date: Thu, 10 Jan 2013 14:26:45 -0300 Subject: [PATCH 9/9] add prefix to logs --- Makefile | 14 +++++++------- lib/SQL/Bibliosoph.pm | 10 ++++++++-- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 2e01282..e45aad2 100644 --- a/Makefile +++ b/Makefile @@ -57,11 +57,11 @@ DIRFILESEP = / DFSEP = $(DIRFILESEP) NAME = SQL::Bibliosoph NAME_SYM = SQL_Bibliosoph -VERSION = 2.51 +VERSION = 2.52 VERSION_MACRO = VERSION -VERSION_SYM = 2_51 +VERSION_SYM = 2_52 DEFINE_VERSION = -D$(VERSION_MACRO)=\"$(VERSION)\" -XS_VERSION = 2.51 +XS_VERSION = 2.52 XS_VERSION_MACRO = XS_VERSION XS_DEFINE_VERSION = -D$(XS_VERSION_MACRO)=\"$(XS_VERSION)\" INST_ARCHLIB = blib/arch @@ -273,7 +273,7 @@ RCS_LABEL = rcs -Nv$(VERSION_SYM): -q DIST_CP = best DIST_DEFAULT = tardist DISTNAME = SQL-Bibliosoph -DISTVNAME = SQL-Bibliosoph-2.51 +DISTVNAME = SQL-Bibliosoph-2.52 # --- MakeMaker macro section: @@ -534,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.51' >> META_new.yml + $(NOECHO) $(ECHO) 'version: 2.52' >> META_new.yml -$(NOECHO) $(MV) META_new.yml $(DISTVNAME)/META.yml $(NOECHO) $(ECHO) Generating META.json $(NOECHO) $(ECHO) '{' > META_new.json @@ -590,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.51"' >> META_new.json + $(NOECHO) $(ECHO) ' "version" : "2.52"' >> META_new.json $(NOECHO) $(ECHO) '}' >> META_new.json -$(NOECHO) $(MV) META_new.json $(DISTVNAME)/META.json @@ -886,7 +886,7 @@ testdb_static :: testdb_dynamic # --- MakeMaker ppd section: # Creates a PPD (Perl Package Description) for a binary distribution. ppd : - $(NOECHO) $(ECHO) '' > $(DISTNAME).ppd + $(NOECHO) $(ECHO) '' > $(DISTNAME).ppd $(NOECHO) $(ECHO) ' A SQL Query library' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' Matias Alejo Garcia ( matiu@cpan.org ) ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd diff --git a/lib/SQL/Bibliosoph.pm b/lib/SQL/Bibliosoph.pm index e70b915..2d511b9 100644 --- a/lib/SQL/Bibliosoph.pm +++ b/lib/SQL/Bibliosoph.pm @@ -9,7 +9,7 @@ package SQL::Bibliosoph; { use SQL::Bibliosoph::Query; use SQL::Bibliosoph::CatalogFile; - our $VERSION = "2.51"; + our $VERSION = "2.52"; has 'dbh' => ( is => 'ro', isa => 'DBI::db', required=> 1); @@ -25,6 +25,7 @@ package SQL::Bibliosoph; { has 'queries' => ( is => 'rw', default=> sub { return {}; } ); has 'memc' => ( is => 'rw'); + has 'log_prefix'=> ( is => 'rw'); has throw_errors=> ( is => 'rw', default=> 1); ## OLD (just for backwards compat) @@ -33,7 +34,10 @@ package SQL::Bibliosoph; { sub d { my $self = shift; my $name = shift; - print STDERR $name.join (':', map { $_ // 'NULL' } @_ ) if $self->debug(); + print STDERR + $self->log_prefix() + . $name + . join (':', map { $_ // 'NULL' } @_ ) if $self->debug(); } #------------------------------------------------------------------ @@ -41,6 +45,8 @@ package SQL::Bibliosoph; { sub BUILD { my ($self) = @_; + $self->log_prefix('') if ! $self->log_prefix(); + $self->d( "Constructing Bibliosoph\n" ) ; $self->path( $self->path() . '/' ) if $self->path() ;