Hello community, here is the log from the commit of package perl-SQL-Abstract for openSUSE:Factory checked in at 2018-07-28 12:39:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-SQL-Abstract (Old) and /work/SRC/openSUSE:Factory/.perl-SQL-Abstract.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-SQL-Abstract" Sat Jul 28 12:39:26 2018 rev:14 rq:623037 version:1.86 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-SQL-Abstract/perl-SQL-Abstract.changes 2018-02-02 22:23:32.802333710 +0100 +++ /work/SRC/openSUSE:Factory/.perl-SQL-Abstract.new/perl-SQL-Abstract.changes 2018-07-28 12:39:27.780317462 +0200 @@ -1,0 +2,12 @@ +Tue Jul 10 06:00:40 UTC 2018 - [email protected] + +- updated to 1.86 + see /usr/share/doc/packages/perl-SQL-Abstract/Changes + + 1.86 - 2018-07-09 + - Remove obsolete documentation about arrayrefref as the $source + argument for ->select (removed in version 1.74) + - Factor out the field list part of SELECT for subclassability (GH#13) + - Do not replace literal '0' with empty string in WHERE clauses (GH#14) + +------------------------------------------------------------------- Old: ---- SQL-Abstract-1.85.tar.gz New: ---- SQL-Abstract-1.86.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-SQL-Abstract.spec ++++++ --- /var/tmp/diff_new_pack.totzWY/_old 2018-07-28 12:39:28.704319238 +0200 +++ /var/tmp/diff_new_pack.totzWY/_new 2018-07-28 12:39:28.704319238 +0200 @@ -17,11 +17,11 @@ Name: perl-SQL-Abstract -Version: 1.85 +Version: 1.86 Release: 0 %define cpan_name SQL-Abstract Summary: Generate SQL from Perl data structures -License: Artistic-1.0 or GPL-1.0+ +License: Artistic-1.0 OR GPL-1.0-or-later Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/SQL-Abstract/ Source0: https://cpan.metacpan.org/authors/id/I/IL/ILMARI/%{cpan_name}-%{version}.tar.gz @@ -107,5 +107,6 @@ %files -f %{name}.files %defattr(-,root,root,755) %doc Changes examples README +%license LICENSE %changelog ++++++ SQL-Abstract-1.85.tar.gz -> SQL-Abstract-1.86.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SQL-Abstract-1.85/Changes new/SQL-Abstract-1.86/Changes --- old/SQL-Abstract-1.85/Changes 2018-01-27 12:10:35.000000000 +0100 +++ new/SQL-Abstract-1.86/Changes 2018-07-09 18:24:23.000000000 +0200 @@ -1,5 +1,11 @@ Revision history for SQL::Abstract +1.86 - 2018-07-09 + - Remove obsolete documentation about arrayrefref as the $source + argument for ->select (removed in version 1.74) + - Factor out the field list part of SELECT for subclassability (GH#13) + - Do not replace literal '0' with empty string in WHERE clauses (GH#14) + 1.85 - 2018-01-27 - Restore perl version requirement missed in the Distar port - Factor out the SET ... part of UPDATE for subclassability (GH#12) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SQL-Abstract-1.85/LICENSE new/SQL-Abstract-1.86/LICENSE --- old/SQL-Abstract-1.85/LICENSE 1970-01-01 01:00:00.000000000 +0100 +++ new/SQL-Abstract-1.86/LICENSE 2018-07-09 18:28:58.000000000 +0200 @@ -0,0 +1,374 @@ +Terms of the Perl programming language system itself + +a) the GNU General Public License as published by the Free + Software Foundation; either version 1, or (at your option) any + later version, or +b) the "Artistic License" + +--- The GNU General Public License, Version 1, February 1989 --- + +This software is Copyright (c) 2018 by Nathan Wiger <[email protected]>. + +This is free software, licensed under: + + The GNU General Public License, Version 1, February 1989 + + GNU GENERAL PUBLIC LICENSE + Version 1, February 1989 + + Copyright (C) 1989 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The license agreements of most software companies try to keep users +at the mercy of those companies. By contrast, our General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. The +General Public License applies to the Free Software Foundation's +software and to any other program whose authors commit to using it. +You can use it for your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Specifically, the General Public License is designed to make +sure that you have the freedom to give away or sell copies of free +software, that you receive source code or can get it if you want it, +that you can change the software or use pieces of it in new free +programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of a such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must tell them their rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any program or other work which +contains a notice placed by the copyright holder saying it may be +distributed under the terms of this General Public License. The +"Program", below, refers to any such program or work, and a "work based +on the Program" means either the Program or any work containing the +Program or a portion of it, either verbatim or with modifications. Each +licensee is addressed as "you". + + 1. You may copy and distribute verbatim copies of the Program's source +code as you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice and +disclaimer of warranty; keep intact all the notices that refer to this +General Public License and to the absence of any warranty; and give any +other recipients of the Program a copy of this General Public License +along with the Program. You may charge a fee for the physical act of +transferring a copy. + + 2. You may modify your copy or copies of the Program or any portion of +it, and copy and distribute such modifications under the terms of Paragraph +1 above, provided that you also do the following: + + a) cause the modified files to carry prominent notices stating that + you changed the files and the date of any change; and + + b) cause the whole of any work that you distribute or publish, that + in whole or in part contains the Program or any part thereof, either + with or without modifications, to be licensed at no charge to all + third parties under the terms of this General Public License (except + that you may choose to grant warranty protection to some or all + third parties, at your option). + + c) If the modified program normally reads commands interactively when + run, you must cause it, when started running for such interactive use + in the simplest and most usual way, to print or display an + announcement including an appropriate copyright notice and a notice + that there is no warranty (or else, saying that you provide a + warranty) and that users may redistribute the program under these + conditions, and telling the user how to view a copy of this General + Public License. + + d) You may charge a fee for the physical act of transferring a + copy, and you may at your option offer warranty protection in + exchange for a fee. + +Mere aggregation of another independent work with the Program (or its +derivative) on a volume of a storage or distribution medium does not bring +the other work under the scope of these terms. + + 3. You may copy and distribute the Program (or a portion or derivative of +it, under Paragraph 2) in object code or executable form under the terms of +Paragraphs 1 and 2 above provided that you also do one of the following: + + a) accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of + Paragraphs 1 and 2 above; or, + + b) accompany it with a written offer, valid for at least three + years, to give any third party free (except for a nominal charge + for the cost of distribution) a complete machine-readable copy of the + corresponding source code, to be distributed under the terms of + Paragraphs 1 and 2 above; or, + + c) accompany it with the information you received as to where the + corresponding source code may be obtained. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form alone.) + +Source code for a work means the preferred form of the work for making +modifications to it. For an executable file, complete source code means +all the source code for all modules it contains; but, as a special +exception, it need not include source code for modules which are standard +libraries that accompany the operating system on which the executable +file runs, or for standard header files or definitions files that +accompany that operating system. + + 4. You may not copy, modify, sublicense, distribute or transfer the +Program except as expressly provided under this General Public License. +Any attempt otherwise to copy, modify, sublicense, distribute or transfer +the Program is void, and will automatically terminate your rights to use +the Program under this License. However, parties who have received +copies, or rights to use copies, from you under this General Public +License will not have their licenses terminated so long as such parties +remain in full compliance. + + 5. By copying, distributing or modifying the Program (or any work based +on the Program) you indicate your acceptance of this license to do so, +and all its terms and conditions. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the original +licensor to copy, distribute or modify the Program subject to these +terms and conditions. You may not impose any further restrictions on the +recipients' exercise of the rights granted herein. + + 7. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of the license which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +the license, you may choose any version ever published by the Free Software +Foundation. + + 8. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to humanity, the best way to achieve this is to make it +free software which everyone can redistribute and change under these +terms. + + To do so, attach the following notices to the program. It is safest to +attach them to the start of each source file to most effectively convey +the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) 19yy <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 1, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19xx name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the +appropriate parts of the General Public License. Of course, the +commands you use may be called something other than `show w' and `show +c'; they could even be mouse-clicks or menu items--whatever suits your +program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + program `Gnomovision' (a program to direct compilers to make passes + at assemblers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +That's all there is to it! + + +--- The Artistic License 1.0 --- + +This software is Copyright (c) 2018 by Nathan Wiger <[email protected]>. + +This is free software, licensed under: + + The Artistic License 1.0 + +The Artistic License + +Preamble + +The intent of this document is to state the conditions under which a Package +may be copied, such that the Copyright Holder maintains some semblance of +artistic control over the development of the package, while giving the users of +the package the right to use and distribute the Package in a more-or-less +customary fashion, plus the right to make reasonable modifications. + +Definitions: + + - "Package" refers to the collection of files distributed by the Copyright + Holder, and derivatives of that collection of files created through + textual modification. + - "Standard Version" refers to such a Package if it has not been modified, + or has been modified in accordance with the wishes of the Copyright + Holder. + - "Copyright Holder" is whoever is named in the copyright or copyrights for + the package. + - "You" is you, if you're thinking about copying or distributing this Package. + - "Reasonable copying fee" is whatever you can justify on the basis of media + cost, duplication charges, time of people involved, and so on. (You will + not be required to justify it to the Copyright Holder, but only to the + computing community at large as a market that must bear the fee.) + - "Freely Available" means that no fee is charged for the item itself, though + there may be fees involved in handling the item. It also means that + recipients of the item may redistribute it under the same conditions they + received it. + +1. You may make and give away verbatim copies of the source form of the +Standard Version of this Package without restriction, provided that you +duplicate all of the original copyright notices and associated disclaimers. + +2. You may apply bug fixes, portability fixes and other modifications derived +from the Public Domain or from the Copyright Holder. A Package modified in such +a way shall still be considered the Standard Version. + +3. You may otherwise modify your copy of this Package in any way, provided that +you insert a prominent notice in each changed file stating how and when you +changed that file, and provided that you do at least ONE of the following: + + a) place your modifications in the Public Domain or otherwise make them + Freely Available, such as by posting said modifications to Usenet or an + equivalent medium, or placing the modifications on a major archive site + such as ftp.uu.net, or by allowing the Copyright Holder to include your + modifications in the Standard Version of the Package. + + b) use the modified Package only within your corporation or organization. + + c) rename any non-standard executables so the names do not conflict with + standard executables, which must also be provided, and provide a separate + manual page for each non-standard executable that clearly documents how it + differs from the Standard Version. + + d) make other distribution arrangements with the Copyright Holder. + +4. You may distribute the programs of this Package in object code or executable +form, provided that you do at least ONE of the following: + + a) distribute a Standard Version of the executables and library files, + together with instructions (in the manual page or equivalent) on where to + get the Standard Version. + + b) accompany the distribution with the machine-readable source of the Package + with your modifications. + + c) accompany any non-standard executables with their corresponding Standard + Version executables, giving the non-standard executables non-standard + names, and clearly documenting the differences in manual pages (or + equivalent), together with instructions on where to get the Standard + Version. + + d) make other distribution arrangements with the Copyright Holder. + +5. You may charge a reasonable copying fee for any distribution of this +Package. You may charge any fee you choose for support of this Package. You +may not charge a fee for this Package itself. However, you may distribute this +Package in aggregate with other (possibly commercial) programs as part of a +larger (possibly commercial) software distribution provided that you do not +advertise this Package as a product of your own. + +6. The scripts and library files supplied as input to or produced as output +from the programs of this Package do not automatically fall under the copyright +of this Package, but belong to whomever generated them, and may be sold +commercially, and may be aggregated with this Package. + +7. C or perl subroutines supplied by you and linked into this Package shall not +be considered part of this Package. + +8. The name of the Copyright Holder may not be used to endorse or promote +products derived from this software without specific prior written permission. + +9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + +The End + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SQL-Abstract-1.85/MANIFEST new/SQL-Abstract-1.86/MANIFEST --- old/SQL-Abstract-1.85/MANIFEST 2018-01-27 12:15:01.000000000 +0100 +++ new/SQL-Abstract-1.86/MANIFEST 2018-07-09 18:28:58.000000000 +0200 @@ -40,3 +40,4 @@ META.yml Module YAML meta-data (added by MakeMaker) META.json Module JSON meta-data (added by MakeMaker) README README file (added by Distar) +LICENSE LICENSE file (added by Distar) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SQL-Abstract-1.85/META.json new/SQL-Abstract-1.86/META.json --- old/SQL-Abstract-1.85/META.json 2018-01-27 12:15:01.000000000 +0100 +++ new/SQL-Abstract-1.86/META.json 2018-07-09 18:28:58.000000000 +0200 @@ -4,13 +4,13 @@ "Nathan Wiger <[email protected]>" ], "dynamic_config" : 0, - "generated_by" : "ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150010", + "generated_by" : "ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010", "license" : [ "perl_5" ], "meta-spec" : { "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec";, - "version" : "2" + "version" : 2 }, "name" : "SQL-Abstract", "no_index" : { @@ -80,6 +80,6 @@ }, "x_IRC" : "irc://irc.perl.org/#dbix-class" }, - "version" : "1.85", - "x_serialization_backend" : "JSON::PP version 2.27400_02" + "version" : "1.86", + "x_serialization_backend" : "JSON::PP version 2.97001" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SQL-Abstract-1.85/META.yml new/SQL-Abstract-1.86/META.yml --- old/SQL-Abstract-1.85/META.yml 2018-01-27 12:15:01.000000000 +0100 +++ new/SQL-Abstract-1.86/META.yml 2018-07-09 18:28:58.000000000 +0200 @@ -11,7 +11,7 @@ configure_requires: ExtUtils::MakeMaker: '0' dynamic_config: 0 -generated_by: 'ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150010' +generated_by: 'ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -39,5 +39,5 @@ bugtracker: https://rt.cpan.org/Public/Dist/Display.html?Name=SQL-Abstract license: http://dev.perl.org/licenses/ repository: https://github.com/dbsrgits/sql-abstract.git -version: '1.85' +version: '1.86' x_serialization_backend: 'CPAN::Meta::YAML version 0.018' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SQL-Abstract-1.85/README new/SQL-Abstract-1.86/README --- old/SQL-Abstract-1.85/README 2018-01-27 12:15:01.000000000 +0100 +++ new/SQL-Abstract-1.86/README 2018-07-09 18:28:58.000000000 +0200 @@ -212,7 +212,7 @@ WHERE event_date >= '2/13/99' AND event_date <= '4/24/03' The logic can also be changed locally by inserting a modifier in - front of an arrayref : + front of an arrayref: @where = (-and => [event_date => {'>=', '2/13/99'}, event_date => {'<=', '4/24/03'} ]); @@ -396,15 +396,13 @@ select($source, $fields, $where, $order) This returns a SQL SELECT statement and associated list of bind values, - as specified by the arguments : + as specified by the arguments: $source Specification of the 'FROM' part of the statement. The argument can be either a plain scalar (interpreted as a table name, will be quoted), or an arrayref (interpreted as a list of table names, - joined by commas, quoted), or a scalarref (literal table name, not - quoted), or a ref to an arrayref (list of literal table names, - joined by commas, not quoted). + joined by commas, quoted), or a scalarref (literal SQL, not quoted). $fields Specification of the list of fields to retrieve from the source. The @@ -707,7 +705,7 @@ status => [ -or => {'=', 'assigned'}, {'=', 'in-progress'}] status => [ {'=', 'assigned'}, {'=', 'in-progress'} ] - Special operators : IN, BETWEEN, etc. + Special operators: IN, BETWEEN, etc. You can also use the hashref format to compare a list of fields using the "IN" comparison operator, by specifying the list as an arrayref: @@ -725,8 +723,8 @@ same way. If the argument to "-in" is an empty array, 'sqlfalse' is generated (by - default : "1=0"). Similarly, "-not_in => []" generates 'sqltrue' (by - default : "1=1"). + default: "1=0"). Similarly, "-not_in => []" generates 'sqltrue' (by + default: "1=1"). In addition to the array you can supply a chunk of literal sql or literal sql with bind: @@ -788,7 +786,7 @@ @bind = (1, 2, 1, 2, 'stuff'); These are the two builtin "special operators"; but the list can be - expanded : see section "SPECIAL OPERATORS" below. + expanded: see section "SPECIAL OPERATORS" below. Unary operators: bool If you wish to test against boolean columns or functions within your @@ -848,7 +846,7 @@ @bind = ('nwiger', 'pending', 'dispatched', 'robot', 'unassigned'); Clauses in hashrefs or arrayrefs can be prefixed with an "-and" or "-or" - to change the logic inside : + to change the logic inside: my @where = ( -and => [ @@ -871,7 +869,7 @@ "Important note": when connecting several conditions, the "-and-"|"-or" operator goes "outside" of the nested structure; whereas when connecting several constraints on one column, the "-and" operator goes "inside" the - arrayref. Here is an example combining both features : + arrayref. Here is an example combining both features: my @where = ( -and => [a => 1, b => 2], @@ -886,20 +884,20 @@ OR ( e LIKE ? AND e LIKE ? ) ) ) This difference in syntax is unfortunate but must be preserved for - historical reasons. So be careful : the two examples below would seem + historical reasons. So be careful: the two examples below would seem algebraically equivalent, but they are not { col => [ -and => { -like => 'foo%' }, { -like => '%bar' }, ] } - # yields : WHERE ( ( col LIKE ? AND col LIKE ? ) ) + # yields: WHERE ( ( col LIKE ? AND col LIKE ? ) ) [ -and => { col => { -like => 'foo%' } }, { col => { -like => '%bar' } }, ] - # yields : WHERE ( ( col LIKE ? OR col LIKE ? ) ) + # yields: WHERE ( ( col LIKE ? OR col LIKE ? ) ) Literal SQL and value type operators The basic premise of SQL::Abstract is that in WHERE specifications the @@ -1006,7 +1004,7 @@ ) Literal SQL is especially useful for nesting parenthesized clauses in - the main SQL query. Here is a first example : + the main SQL query. Here is a first example: my ($sub_stmt, @sub_bind) = ("SELECT c1 FROM t1 WHERE c2 < ? AND c3 LIKE ?", 100, "foo%"); @@ -1015,7 +1013,7 @@ bar => \["IN ($sub_stmt)" => @sub_bind], ); - This yields : + This yields: $stmt = "WHERE (foo = ? AND bar IN (SELECT c1 FROM t1 WHERE c2 < ? AND c3 LIKE ?))"; @@ -1035,7 +1033,7 @@ In the examples above, the subquery was used as an operator on a column; but the same principle also applies for a clause within the main %where - hash, like an EXISTS subquery : + hash, like an EXISTS subquery: my ($sub_stmt, @sub_bind) = $sql->select("t1", "*", {c1 => 1, c2 => \"> t0.c0"}); @@ -1051,7 +1049,7 @@ @bind = (1234, 1); Observe that the condition on "c2" in the subquery refers to column - "t0.c0" of the main query : this is *not* a bind value, so we have to + "t0.c0" of the main query: this is *not* a bind value, so we have to express it through a scalar ref. Writing "c2 => {">" => "t0.c0"}" would have generated "c2 > ?" with bind value "t0.c0" ... not exactly what we wanted here. @@ -1171,7 +1169,7 @@ ]); A "special operator" is a SQL syntactic clause that can be applied to a - field, instead of a usual binary operator. For example : + field, instead of a usual binary operator. For example: WHERE field IN (?, ?, ?) WHERE field BETWEEN ? AND ? @@ -1363,7 +1361,7 @@ that was relying on some dark areas of "SQL::Abstract" v1.* might behave differently in v1.50. - The main changes are : + The main changes are: * support for literal SQL through the "\ [ $sql, @bind ]" syntax. @@ -1375,7 +1373,7 @@ * optional support for array datatypes - * defensive programming : check arguments + * defensive programming: check arguments * fixed bug with global logic, which was previously implemented through global variables yielding side-effects. Prior versions would diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SQL-Abstract-1.85/lib/SQL/Abstract.pm new/SQL-Abstract-1.86/lib/SQL/Abstract.pm --- old/SQL-Abstract-1.85/lib/SQL/Abstract.pm 2018-01-27 12:10:01.000000000 +0100 +++ new/SQL-Abstract-1.86/lib/SQL/Abstract.pm 2018-07-09 18:22:24.000000000 +0200 @@ -27,7 +27,7 @@ # GLOBALS #====================================================================== -our $VERSION = '1.85'; +our $VERSION = '1.86'; # This would confuse some packagers $VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases @@ -330,7 +330,7 @@ push @all_bind, @bind; }, - # THINK : anything useful to do with a HASHREF ? + # THINK: anything useful to do with a HASHREF ? HASHREF => sub { # (nothing, but old SQLA passed it through) #TODO in SQLA >= 2.0 it will die instead belch "HASH ref as bind value in insert is not supported"; @@ -464,17 +464,24 @@ my $where = shift; my $order = shift; - my($where_sql, @bind) = $self->where($where, $order); + my ($fields_sql, @bind) = $self->_select_fields($fields); - my $f = (ref $fields eq 'ARRAY') ? join ', ', map { $self->_quote($_) } @$fields - : $fields; - my $sql = join(' ', $self->_sqlcase('select'), $f, + my ($where_sql, @where_bind) = $self->where($where, $order); + push @bind, @where_bind; + + my $sql = join(' ', $self->_sqlcase('select'), $fields_sql, $self->_sqlcase('from'), $table) . $where_sql; return wantarray ? ($sql, @bind) : $sql; } +sub _select_fields { + my ($self, $fields) = @_; + return ref $fields eq 'ARRAY' ? join ', ', map { $self->_quote($_) } @$fields + : $fields; +} + #====================================================================== # DELETE #====================================================================== @@ -516,7 +523,7 @@ # where ? my ($sql, @bind) = $self->_recurse_where($where); - $sql = $sql ? $self->_sqlcase(' where ') . "( $sql )" : ''; + $sql = (defined $sql and length $sql) ? $self->_sqlcase(' where ') . "( $sql )" : ''; # order by? if ($order) { @@ -1200,7 +1207,7 @@ sub _where_field_IN { my ($self, $k, $op, $vals) = @_; - # backwards compatibility : if scalar, force into an arrayref + # backwards compatibility: if scalar, force into an arrayref $vals = [$vals] if defined $vals && ! ref $vals; my ($label) = $self->_convert($self->_quote($k)); @@ -1253,7 +1260,7 @@ $self->_bindtype($k, @all_bind), ); } - else { # empty list : some databases won't understand "IN ()", so DWIM + else { # empty list: some databases won't understand "IN ()", so DWIM my $sql = ($op =~ /\bnot\b/i) ? $self->{sqltrue} : $self->{sqlfalse}; return ($sql); } @@ -1922,7 +1929,7 @@ WHERE event_date >= '2/13/99' AND event_date <= '4/24/03' The logic can also be changed locally by inserting -a modifier in front of an arrayref : +a modifier in front of an arrayref: @where = (-and => [event_date => {'>=', '2/13/99'}, event_date => {'<=', '4/24/03'} ]); @@ -2133,7 +2140,7 @@ =head2 select($source, $fields, $where, $order) This returns a SQL SELECT statement and associated list of bind values, as -specified by the arguments : +specified by the arguments: =over @@ -2143,8 +2150,7 @@ The argument can be either a plain scalar (interpreted as a table name, will be quoted), or an arrayref (interpreted as a list of table names, joined by commas, quoted), or a scalarref -(literal table name, not quoted), or a ref to an arrayref -(list of literal table names, joined by commas, not quoted). +(literal SQL, not quoted). =item $fields @@ -2498,7 +2504,7 @@ -=head2 Special operators : IN, BETWEEN, etc. +=head2 Special operators: IN, BETWEEN, etc. You can also use the hashref format to compare a list of fields using the C<IN> comparison operator, by specifying the list as an arrayref: @@ -2517,8 +2523,8 @@ the same way. If the argument to C<-in> is an empty array, 'sqlfalse' is generated -(by default : C<1=0>). Similarly, C<< -not_in => [] >> generates -'sqltrue' (by default : C<1=1>). +(by default: C<1=0>). Similarly, C<< -not_in => [] >> generates +'sqltrue' (by default: C<1=1>). In addition to the array you can supply a chunk of literal sql or literal sql with bind: @@ -2581,7 +2587,7 @@ These are the two builtin "special operators"; but the -list can be expanded : see section L</"SPECIAL OPERATORS"> below. +list can be expanded: see section L</"SPECIAL OPERATORS"> below. =head2 Unary operators: bool @@ -2645,7 +2651,7 @@ Clauses in hashrefs or arrayrefs can be prefixed with an C<-and> or C<-or> -to change the logic inside : +to change the logic inside: my @where = ( -and => [ @@ -2669,7 +2675,7 @@ C<Important note>: when connecting several conditions, the C<-and->|C<-or> operator goes C<outside> of the nested structure; whereas when connecting several constraints on one column, the C<-and> operator goes -C<inside> the arrayref. Here is an example combining both features : +C<inside> the arrayref. Here is an example combining both features: my @where = ( -and => [a => 1, b => 2], @@ -2684,20 +2690,20 @@ OR ( e LIKE ? AND e LIKE ? ) ) ) This difference in syntax is unfortunate but must be preserved for -historical reasons. So be careful : the two examples below would +historical reasons. So be careful: the two examples below would seem algebraically equivalent, but they are not { col => [ -and => { -like => 'foo%' }, { -like => '%bar' }, ] } - # yields : WHERE ( ( col LIKE ? AND col LIKE ? ) ) + # yields: WHERE ( ( col LIKE ? AND col LIKE ? ) ) [ -and => { col => { -like => 'foo%' } }, { col => { -like => '%bar' } }, ] - # yields : WHERE ( ( col LIKE ? OR col LIKE ? ) ) + # yields: WHERE ( ( col LIKE ? OR col LIKE ? ) ) =head2 Literal SQL and value type operators @@ -2811,7 +2817,7 @@ ) Literal SQL is especially useful for nesting parenthesized clauses in the -main SQL query. Here is a first example : +main SQL query. Here is a first example: my ($sub_stmt, @sub_bind) = ("SELECT c1 FROM t1 WHERE c2 < ? AND c3 LIKE ?", 100, "foo%"); @@ -2820,7 +2826,7 @@ bar => \["IN ($sub_stmt)" => @sub_bind], ); -This yields : +This yields: $stmt = "WHERE (foo = ? AND bar IN (SELECT c1 FROM t1 WHERE c2 < ? AND c3 LIKE ?))"; @@ -2841,7 +2847,7 @@ In the examples above, the subquery was used as an operator on a column; but the same principle also applies for a clause within the main C<%where> -hash, like an EXISTS subquery : +hash, like an EXISTS subquery: my ($sub_stmt, @sub_bind) = $sql->select("t1", "*", {c1 => 1, c2 => \"> t0.c0"}); @@ -2858,7 +2864,7 @@ Observe that the condition on C<c2> in the subquery refers to -column C<t0.c0> of the main query : this is I<not> a bind +column C<t0.c0> of the main query: this is I<not> a bind value, so we have to express it through a scalar ref. Writing C<< c2 => {">" => "t0.c0"} >> would have generated C<< c2 > ? >> with bind value C<"t0.c0"> ... not exactly @@ -2993,7 +2999,7 @@ A "special operator" is a SQL syntactic clause that can be applied to a field, instead of a usual binary operator. -For example : +For example: WHERE field IN (?, ?, ?) WHERE field BETWEEN ? AND ? @@ -3212,7 +3218,7 @@ on some dark areas of C<SQL::Abstract> v1.* B<might behave differently> in v1.50. -The main changes are : +The main changes are: =over @@ -3234,7 +3240,7 @@ =item * -defensive programming : check arguments +defensive programming: check arguments =item * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SQL-Abstract-1.85/t/02where.t new/SQL-Abstract-1.86/t/02where.t --- old/SQL-Abstract-1.85/t/02where.t 2014-06-27 22:11:31.000000000 +0200 +++ new/SQL-Abstract-1.86/t/02where.t 2018-07-09 17:48:23.000000000 +0200 @@ -386,6 +386,11 @@ stmt => " WHERE ( (NOT ( c AND (NOT ( (NOT a = ?) AND (NOT b) )) )) ) ", bind => [ 1 ], }, + { + where => \"0", + stmt => " WHERE ( 0 ) ", + bind => [ ], + }, ); for my $case (@handle_tests) {
