r50829 - in /branches/upstream/libtext-query-sql-perl/current: ChangeLog Makefile.PL lib/Bundle/Text/Query/BuildSQL.pm lib/Text/Query/BuildSQL.pm lib/Text/Query/BuildSQLMySQL.pm t/03mysql.t t/21mifluz.t
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Tue Jan 12 19:00:32 UTC 2010
Author: jawnsy-guest
Date: Tue Jan 12 19:00:16 2010
New Revision: 50829
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=50829
Log:
[svn-upgrade] Integrating new upstream version, libtext-querysql-perl (0.09)
Modified:
branches/upstream/libtext-query-sql-perl/current/ChangeLog
branches/upstream/libtext-query-sql-perl/current/Makefile.PL
branches/upstream/libtext-query-sql-perl/current/lib/Bundle/Text/Query/BuildSQL.pm
branches/upstream/libtext-query-sql-perl/current/lib/Text/Query/BuildSQL.pm
branches/upstream/libtext-query-sql-perl/current/lib/Text/Query/BuildSQLMySQL.pm
branches/upstream/libtext-query-sql-perl/current/t/03mysql.t
branches/upstream/libtext-query-sql-perl/current/t/21mifluz.t
Modified: branches/upstream/libtext-query-sql-perl/current/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-query-sql-perl/current/ChangeLog?rev=50829&op=diff
==============================================================================
--- branches/upstream/libtext-query-sql-perl/current/ChangeLog (original)
+++ branches/upstream/libtext-query-sql-perl/current/ChangeLog Tue Jan 12 19:00:16 2010
@@ -1,3 +1,25 @@
+Wed Dec 27 14:12:45 2000 Loic Dachary <loic at senga.org>
+
+ * Relase 0.09
+
+ * t/21mifluz.t: perl-5.6.0 modifications (Data::Dumper-2.101
+ discrepency).
+
+ * Makefile.PL: depend on Text-Query-0.07, waiting for Eric Bohlman
+ to publish the Text-Query-0.08.
+
+Wed Sep 13 16:50:30 2000 Loic Dachary <loic at senga.org>
+
+ * Relase 0.08
+
+ * Makefile.PL: minor fixes for perl-5.6.0
+
+Wed May 03 15:03:51 2000 Loic Dachary <loic at senga.org>
+
+ * lib/Text/Query/BuildSQLMySQL.pm (build_near): patch from
+ steveHalasz at users.sourceforge.net to fix proximity inversion
+ bug. Update tests.
+
Fri Apr 21 11:39:51 2000 Loic Dachary <loic at senga.org>
* Relase 0.07
Modified: branches/upstream/libtext-query-sql-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-query-sql-perl/current/Makefile.PL?rev=50829&op=diff
==============================================================================
--- branches/upstream/libtext-query-sql-perl/current/Makefile.PL (original)
+++ branches/upstream/libtext-query-sql-perl/current/Makefile.PL Tue Jan 12 19:00:16 2010
@@ -16,9 +16,9 @@
# Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
#
#
-# $Header: /cvsroot/TextQuery/Text-Query-SQL/Makefile.PL,v 1.3 2000/04/12 16:35:28 loic Exp $
+# $Header: /cvsroot/TextQuery/Text-Query-SQL/Makefile.PL,v 1.5 2000/12/27 13:14:11 loic Exp $
#
-# This -*- perl -*- script writes the Makefile for Catalog
+# This -*- perl -*- script writes the Makefile for Text-Query-SQL
require 5.004;
use strict;
@@ -27,8 +27,8 @@
use ExtUtils::MakeMaker;
version_check('Text::Query', '0.07', 'require Text::Query;');
-version_check('DBI', '1.06', 'require DBI;');
-version_check('Data::Dumper', '2.09', 'require Data::Dumper;');
+version_check('DBI', '1.13', 'require DBI;');
+version_check('Data::Dumper', '2.101', 'require Data::Dumper;');
#
# Check that package $what is installed and that
@@ -48,7 +48,7 @@
print " failed\n";
print <<EOT;
$@
-Catalog needs $what module, version >= $min_version
+Text-Query-SQL needs $what module, version >= $min_version
EOT
exit;
} else {
Modified: branches/upstream/libtext-query-sql-perl/current/lib/Bundle/Text/Query/BuildSQL.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-query-sql-perl/current/lib/Bundle/Text/Query/BuildSQL.pm?rev=50829&op=diff
==============================================================================
--- branches/upstream/libtext-query-sql-perl/current/lib/Bundle/Text/Query/BuildSQL.pm (original)
+++ branches/upstream/libtext-query-sql-perl/current/lib/Bundle/Text/Query/BuildSQL.pm Tue Jan 12 19:00:16 2010
@@ -1,6 +1,6 @@
package Bundle::Text::Query::BuildSQL;
-$VERSION = "0.07";
+$VERSION = "0.08";
1;
@@ -16,9 +16,9 @@
=head1 CONTENTS
-DBI 1.06 - Database independent interface for Perl
+DBI 1.13 - Database independent interface for Perl
-Data::Dumper 2.09 - Stringified perl data structures
+Data::Dumper 2.101 - Stringified perl data structures
Text::Query 0.07 - Parse and match Boolean expression
Modified: branches/upstream/libtext-query-sql-perl/current/lib/Text/Query/BuildSQL.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-query-sql-perl/current/lib/Text/Query/BuildSQL.pm?rev=50829&op=diff
==============================================================================
--- branches/upstream/libtext-query-sql-perl/current/lib/Text/Query/BuildSQL.pm (original)
+++ branches/upstream/libtext-query-sql-perl/current/lib/Text/Query/BuildSQL.pm Tue Jan 12 19:00:16 2010
@@ -16,7 +16,7 @@
# Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
#
#
-# $Header: /cvsroot/TextQuery/Text-Query-SQL/lib/Text/Query/BuildSQL.pm,v 1.7 2000/04/21 09:43:48 loic Exp $
+# $Header: /cvsroot/TextQuery/Text-Query-SQL/lib/Text/Query/BuildSQL.pm,v 1.9 2000/12/27 13:14:11 loic Exp $
#
package Text::Query::BuildSQL;
@@ -27,7 +27,7 @@
use Text::Query::Build;
use Carp;
-$VERSION = "0.07";
+$VERSION = "0.09";
@ISA = qw(Text::Query::Build);
Modified: branches/upstream/libtext-query-sql-perl/current/lib/Text/Query/BuildSQLMySQL.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-query-sql-perl/current/lib/Text/Query/BuildSQLMySQL.pm?rev=50829&op=diff
==============================================================================
--- branches/upstream/libtext-query-sql-perl/current/lib/Text/Query/BuildSQLMySQL.pm (original)
+++ branches/upstream/libtext-query-sql-perl/current/lib/Text/Query/BuildSQLMySQL.pm Tue Jan 12 19:00:16 2010
@@ -16,7 +16,7 @@
# Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
#
#
-# $Header: /cvsroot/TextQuery/Text-Query-SQL/lib/Text/Query/BuildSQLMySQL.pm,v 1.3 1999/07/01 11:32:11 loic Exp $
+# $Header: /cvsroot/TextQuery/Text-Query-SQL/lib/Text/Query/BuildSQLMySQL.pm,v 1.4 2000/05/03 13:16:19 loic Exp $
#
package Text::Query::BuildSQLMySQL;
@@ -43,7 +43,7 @@
} else {
my($max) = $self->{parseopts}{-near};
my($op) = "([[:space:]]+[[:alnum:]]+){0,$max}[[:space:]]+";
- $t = "$$l[2]$op$$r[2]";
+ $t = "($$l[2]$op$$r[2])|($$r[2]$op$$l[2])";
}
return [ 'literal', $$l[1], $t ];
}
Modified: branches/upstream/libtext-query-sql-perl/current/t/03mysql.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-query-sql-perl/current/t/03mysql.t?rev=50829&op=diff
==============================================================================
--- branches/upstream/libtext-query-sql-perl/current/t/03mysql.t (original)
+++ branches/upstream/libtext-query-sql-perl/current/t/03mysql.t Tue Jan 12 19:00:16 2010
@@ -69,7 +69,7 @@
$question = "word1 near word2";
$query->prepare($question);
- ok($query->matchstring(), " ( field1 regexp '[[:<:]][wW][oO][rR][dD]1([[:space:]]+[[:alnum:]]+){0,10}[[:space:]]+[wW][oO][rR][dD]2[[:>:]]' ) ", "prepare $question");
+ ok($query->matchstring(), " ( field1 regexp '[[:<:]]([wW][oO][rR][dD]1([[:space:]]+[[:alnum:]]+){0,10}[[:space:]]+[wW][oO][rR][dD]2)|([wW][oO][rR][dD]2([[:space:]]+[[:alnum:]]+){0,10}[[:space:]]+[wW][oO][rR][dD]1)[[:>:]]' ) ", "prepare $question");
$question = "not word1";
$query->prepare($question);
@@ -105,7 +105,7 @@
$question = "field2: ( 20 and 21 or field1: 21 ) or field1: 100 or 'field2:' and 30 near 40";
$query->prepare($question);
- ok($query->matchstring(), " ( ( ( ( field2 regexp '[[:<:]]20[[:>:]]' and field2 regexp '[[:<:]]21[[:>:]]' ) or field1 regexp '[[:<:]]21[[:>:]]' ) or field1 regexp '[[:<:]]100[[:>:]]' or ( field1 regexp '[[:<:]][fF][iI][eE][lL][dD]2:[[:>:]]' and field1 regexp '[[:<:]]30([[:space:]]+[[:alnum:]]+){0,10}[[:space:]]+40[[:>:]]' ) ) ) ", "prepare $question");
+ ok($query->matchstring(), " ( ( ( ( field2 regexp '[[:<:]]20[[:>:]]' and field2 regexp '[[:<:]]21[[:>:]]' ) or field1 regexp '[[:<:]]21[[:>:]]' ) or field1 regexp '[[:<:]]100[[:>:]]' or ( field1 regexp '[[:<:]][fF][iI][eE][lL][dD]2:[[:>:]]' and field1 regexp '[[:<:]](30([[:space:]]+[[:alnum:]]+){0,10}[[:space:]]+40)|(40([[:space:]]+[[:alnum:]]+){0,10}[[:space:]]+30)[[:>:]]' ) ) ) ", "prepare $question");
$question = "field2,field3: ( 20 and 21 )";
$query->prepare($question);
Modified: branches/upstream/libtext-query-sql-perl/current/t/21mifluz.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-query-sql-perl/current/t/21mifluz.t?rev=50829&op=diff
==============================================================================
--- branches/upstream/libtext-query-sql-perl/current/t/21mifluz.t (original)
+++ branches/upstream/libtext-query-sql-perl/current/t/21mifluz.t Tue Jan 12 19:00:16 2010
@@ -12,19 +12,27 @@
$Data::Dumper::Terse = 1;
$Data::Dumper::Indent = 0;
+#
+# Can you believe this ? Data::Dumper 2.101 in perl 5.6 is not the same
+# as Data::Dumper 2.101 on CPAN. Christ.
+#
+my($v56) = ($] >= 5.006) ? 1 : 0;
+
{
my($question);
my($query) = Text::Query->new('blurk',
-build => 'Text::Query::BuildSQLMifluz',
-fields_searched => 'field1',
);
+ my($expect) = $v56 ? "['literal','field1','10']" : "['literal','field1',10]";
$question = "10";
$query->prepare($question);
- ok(Dumper($query->{'matchexp'}), "['literal','field1',10]", "prepare $question");
+ ok(Dumper($query->{'matchexp'}), $expect, "prepare $question");
+ $expect = $v56 ? "['or','field1',['mandatory','field1',['literal','field1','10']],['forbiden','field1',['literal','field1','20']],['literal','field1','30']]" : "['or','field1',['mandatory','field1',['literal','field1',10]],['forbiden','field1',['literal','field1',20]],['literal','field1',30]]";
$question = "+10 -20 30";
$query->prepare($question);
- ok(Dumper($query->{'matchexp'}), "['or','field1',['mandatory','field1',['literal','field1',10]],['forbiden','field1',['literal','field1',20]],['literal','field1',30]]", "prepare $question");
+ ok(Dumper($query->{'matchexp'}), $expect, "prepare $question");
}
More information about the Pkg-perl-cvs-commits
mailing list