DB::$ssl now works even if DB::$ssl['key'] is NULL

DB::$connect_flags allows access to flags passed to $mysqli->real_connect() Resolves #82 Resolves #83
add another queryWalk() test case
2022-03-24 16:58:37 +00:00 · 2021-08-14 05:08:41 +00:00 · 2021-08-14 05:02:27 +00:00 · 2021-08-08 14:15:19 +00:00 · 2021-06-29 04:31:23 +00:00 · 2021-06-28 22:37:53 +00:00
16 changed files with 2402 additions and 1155 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+simpletest/test_setup.php
--- a/674
+++ b/674
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), 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 prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey 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;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU 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 that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  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.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-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.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            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 the public, 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
-state 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) <year>  <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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program 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, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
--- a/COPYING.LESSER
+++ b/COPYING.LESSER
--- a/README.md
+++ b/README.md
@@ -0,0 +1,167 @@
+MeekroDB -- The Simple PHP MySQL Library
+========
+Learn more: http://www.meekro.com
+
+MeekroDB is: 
+
+* A PHP MySQL library that lets you **get more done with fewer lines of code**, and **makes SQL injection 100% impossible**.
+* Google's #1 search result for "php mysql library" since 2013, with **thousands of deployments worldwide**.
+* A library with a **perfect security track record**. No bugs relating to security or SQL injection have ever been discovered.
+
+Installation
+========
+When you're ready to get started, see the [Quick Start Guide](http://www.meekro.com/quickstart.php) on our website.
+
+### Manual Setup
+Include the `db.class.php` file into your project and set it up like this:
+
+```php
+require_once 'db.class.php';
+DB::$user = 'my_database_user';
+DB::$password = 'my_database_password';
+DB::$dbName = 'my_database_name';
+```
+
+### Composer
+Add this to your `composer.json`
+
+```json
+{
+  "require": {
+    "sergeytsalkov/meekrodb": "*"
+  }
+}
+```
+
+Code Examples
+========
+### Grab some rows from the database and print out a field from each row.
+
+```php
+$accounts = DB::query("SELECT * FROM accounts WHERE type = %s AND age > %i", $type, 15);
+foreach ($accounts as $account) {
+  echo $account['username'] . "\n";
+}
+```
+
+
+
+### Insert a new row.
+
+```php
+DB::insert('mytable', array(
+  'name' => $name,
+  'rank' => $rank,
+  'location' => $location,
+  'age' => $age,
+  'intelligence' => $intelligence
+));
+```
+    
+### Grab one row or field
+
+```php
+$account = DB::queryFirstRow("SELECT * FROM accounts WHERE username=%s", 'Joe');
+$number_accounts = DB::queryFirstField("SELECT COUNT(*) FROM accounts");
+```
+
+### Use a list in a query
+```php
+DB::query("SELECT * FROM tbl WHERE name IN %ls AND age NOT IN %li", array('John', 'Bob'), array(12, 15));
+```
+
+### Log all queries and errors
+```php
+// log all queries and errors to file, or ..
+DB::$logfile = '/home/username/logfile.txt';
+
+// log all queries and errors to screen
+DB::$logfile = fopen('php://output', 'w');
+```
+
+### Nested Transactions
+```php
+DB::$nested_transactions = true;
+DB::startTransaction(); // outer transaction
+// .. some queries..
+$depth = DB::startTransaction(); // inner transaction
+echo $depth . 'transactions are currently active'; // 2
+ 
+// .. some queries..
+DB::commit(); // commit inner transaction
+// .. some queries..
+DB::commit(); // commit outer transaction
+```
+    
+### Lots More - See: http://meekro.com/docs
+
+    
+How is MeekroDB better than PDO?
+========
+### Optional Static Class Mode
+Most web apps will only ever talk to one database. This means that 
+passing $db objects to every function of your code just adds unnecessary clutter. 
+The simplest approach is to use static methods such as DB::query(), and that's how 
+MeekroDB works. Still, if you need database objects, MeekroDB can do that too.
+
+### Do more with fewer lines of code
+The code below escapes your parameters for safety, runs the query, and grabs 
+the first row of results. Try doing that in one line with PDO.
+
+```php
+$account = DB::queryFirstRow("SELECT * FROM accounts WHERE username=%s", 'Joe');
+```
+
+Or how about just one field?
+
+```php
+$created_at = DB::queryFirstField("SELECT created_at FROM accounts WHERE username=%s", 'Joe');
+```
+
+### Work with list parameters easily
+Using MySQL's IN keyword should not be hard. MeekroDB smooths out the syntax for you, 
+PDO does not.
+
+```php
+$accounts = DB::query("SELECT * FROM accounts WHERE username IN %ls", array('Joe', 'Frank'));
+```
+
+
+### Simple inserts
+Using MySQL's INSERT should not be more complicated than passing in an 
+associative array. MeekroDB also simplifies many related commands, including 
+the useful and bizarre INSERT .. ON DUPLICATE UPDATE command. PDO does none of this.
+
+```php
+DB::insert('accounts', array('username' => 'John', 'password' => 'whatever'));
+```
+
+### Nested transactions
+MySQL's SAVEPOINT commands lets you create nested transactions, but only 
+if you keep track of SAVEPOINT ids yourself. MeekroDB does this for you, 
+so you can have nested transactions with no complexity or learning curve.
+
+```php
+DB::$nested_transactions = true;
+DB::startTransaction(); // outer transaction
+// .. some queries..
+$depth = DB::startTransaction(); // inner transaction
+echo $depth . 'transactions are currently active'; // 2
+ 
+// .. some queries..
+DB::commit(); // commit inner transaction
+// .. some queries..
+DB::commit(); // commit outer transaction
+```
+
+### Flexible debug logging and error handling
+You can log all queries (and any errors they produce) to a file for debugging purposes. You can also add hooks that let you run your own functions at any point in the query handling process.
+
+
+My Other Projects
+========
+A little shameless self-promotion!
+
+  * [Ark Server Hosting](https://arkservers.io) -- Ark: Survival Evolved server hosting by ArkServers.io!
+  * [Best Minecraft Server Hosting](https://bestminecraft.org) -- Ranking and recommendations for minecraft server hosting!
+  * [brooce](https://github.com/SergeyTsalkov/brooce) - Language-agnostic job queue written in Go! Write your jobs in any language, schedule them from any language, run them anywhere!
--- a/composer.json
+++ b/composer.json
@@ -0,0 +1,29 @@
+{
+    "name": "sergeytsalkov/meekrodb",
+    "description": "The Simple PHP/MySQL Library",
+    "homepage": "http://www.meekro.com",
+    "support": {
+        "email": "support@meekro.com"
+    },
+    "keywords": [
+        "mysql",
+        "database",
+        "mysqli",
+        "pdo"
+    ],
+    "license": "LGPL-3.0",
+    "authors": [
+        {
+            "name": "Sergey Tsalkov",
+            "email": "stsalkov@gmail.com"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.0"
+    },
+    "autoload": {
+        "classmap": [
+            "db.class.php"
+        ]
+    }
+}
--- a/db.class.php
+++ b/db.class.php
--- a/simpletest/BasicTest.php
+++ b/simpletest/BasicTest.php
@@ -1,42 +1,39 @@
 <?php
-function new_error_callback($params) {
-  global $error_callback_worked;
-  
-  if (substr_count($params['error'], 'You have an error in your SQL syntax')) $error_callback_worked = 1;
-}
-
-function my_debug_handler($params) {
-  global $debug_callback_worked;
-  if (substr_count($params['query'], 'SELECT')) $debug_callback_worked = 1;
-}
-
-
 class BasicTest extends SimpleTest {
  function __construct() {
-    error_reporting(E_ALL);
-    require_once '../db.class.php';
-    DB::$user = 'libdb_user';
-    DB::$password = 'sdf235sklj';
-    DB::$dbName = 'libdb_test';
-    DB::query("DROP DATABASE libdb_test");
-    DB::query("CREATE DATABASE libdb_test");
-    DB::useDB('libdb_test');
+    foreach (DB::tableList() as $table) {
+      DB::query("DROP TABLE %b", $table);
+    }
  }
  
  
  function test_1_create_table() {
    DB::query("CREATE TABLE `accounts` (
    `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+    `profile_id` INT NOT NULL,
    `username` VARCHAR( 255 ) NOT NULL ,
-    `password` VARCHAR( 255 ) NOT NULL ,
+    `password` VARCHAR( 255 ) NULL ,
    `age` INT NOT NULL DEFAULT '10',
-    `height` DOUBLE NOT NULL DEFAULT '10.0'
+    `height` DOUBLE NOT NULL DEFAULT '10.0',
+    `favorite_word` VARCHAR( 255 ) NULL DEFAULT 'hi',
+    `birthday` TIMESTAMP NOT NULL
+    ) ENGINE = InnoDB");
+
+    DB::query("CREATE TABLE `profile` (
+    `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+    `signature` VARCHAR( 255 ) NULL DEFAULT 'donewriting'
+    ) ENGINE = InnoDB");
+
+    DB::query("CREATE TABLE `fake%s_table` (
+    `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+    `name` VARCHAR( 255 ) NULL DEFAULT 'blah'
    ) ENGINE = InnoDB");
  }
  
  function test_1_5_empty_table() {
    $counter = DB::queryFirstField("SELECT COUNT(*) FROM accounts");
    $this->assert($counter === strval(0));
+    $this->assert(DB::lastQuery() === 'SELECT COUNT(*) FROM accounts');
    
    $row = DB::queryFirstRow("SELECT * FROM accounts");
    $this->assert($row === null);
@@ -55,11 +52,12 @@ class BasicTest extends SimpleTest {
  }
  
  function test_2_insert_row() {
-    DB::insert('accounts', array(
+    $true = DB::insert('accounts', array(
      'username' => 'Abe',
      'password' => 'hello'
    ));
    
+    $this->assert($true === true);
    $this->assert(DB::affectedRows() === 1);
    
    $counter = DB::queryFirstField("SELECT COUNT(*) FROM accounts");
@@ -73,22 +71,44 @@ class BasicTest extends SimpleTest {
      'age' => 15,
      'height' => 10.371
    ));
-    
-    DB::insert('`libdb_test`.`accounts`', array(
+    $dbname = DB::$dbName;
+    DB::insert("`$dbname`.`accounts`", array(
      'username' => 'Charlie\'s Friend',
      'password' => 'goodbye',
      'age' => 30,
-      'height' => 155.23
+      'height' => 155.23,
+      'favorite_word' => null,
    ));
    
    $this->assert(DB::insertId() === 3);
-    
    $counter = DB::queryFirstField("SELECT COUNT(*) FROM accounts");
    $this->assert($counter === strval(3));
    
-    $bart = DB::queryFirstRow("SELECT * FROM accounts WHERE age IN %li AND height IN %ld AND username IN %ls", 
+    DB::insert('`accounts`', array(
+      'username' => 'Deer',
+      'password' => '',
+      'age' => 15,
+      'height' => 10.371
+    ));
+
+    $username = DB::queryFirstField("SELECT username FROM accounts WHERE password=%s0", null);
+    $this->assert($username === 'Deer');
+
+    $password = DB::queryFirstField("SELECT password FROM accounts WHERE favorite_word IS NULL");
+    $this->assert($password === 'goodbye');
+    
+    DB::insertUpdate('accounts', array(
+      'id' => 3,
+      'favorite_word' => null,
+    ));
+    
+    DB::$param_char = '###';
+    $bart = DB::queryFirstRow("SELECT * FROM accounts WHERE age IN ###li AND height IN ###ld AND username IN ###ls", 
      array(15, 25), array(10.371, 150.123), array('Bart', 'Barts'));
    $this->assert($bart['username'] === 'Bart');
+    DB::insert('accounts', array('username' => 'f_u'));
+    DB::query("DELETE FROM accounts WHERE username=###s", 'f_u');
+    DB::$param_char = '%';
    
    $charlie_password = DB::queryFirstField("SELECT password FROM accounts WHERE username IN %ls AND username = %s", 
      array('Charlie', 'Charlie\'s Friend'), 'Charlie\'s Friend');
@@ -97,63 +117,330 @@ class BasicTest extends SimpleTest {
    $charlie_password = DB::queryOneField('password', "SELECT * FROM accounts WHERE username IN %ls AND username = %s", 
      array('Charlie', 'Charlie\'s Friend'), 'Charlie\'s Friend');
    $this->assert($charlie_password === 'goodbye');
+    
+    $passwords = DB::queryFirstColumn("SELECT password FROM accounts WHERE username=%s", 'Bart');
+    $this->assert(count($passwords) === 1);
+    $this->assert($passwords[0] === 'hello');
+    
+    $username = $password = $age = null;
+    list($age, $username, $password) = DB::queryOneList("SELECT age,username,password FROM accounts WHERE username=%s", 'Bart');
+    $this->assert($username === 'Bart');
+    $this->assert($password === 'hello');
+    $this->assert($age == 15);
+    
+    $mysqli_result = DB::queryRaw("SELECT * FROM accounts WHERE favorite_word IS NULL");
+    $this->assert($mysqli_result instanceof MySQLi_Result);
+    $row = $mysqli_result->fetch_assoc();
+    $this->assert($row['password'] === 'goodbye');
+    $this->assert($mysqli_result->fetch_assoc() === null);
  }
  
  function test_4_query() {
-    $results = DB::query("SELECT * FROM accounts WHERE username=%s", 'Charlie\'s Friend');
+    DB::update('accounts', array(
+      'birthday' => new DateTime('10 September 2000 13:13:13')
+    ), 'username=%s', 'Charlie\'s Friend');
+    
+    $results = DB::query("SELECT * FROM accounts WHERE username=%s AND birthday IN %lt", 'Charlie\'s Friend', array('September 10 2000 13:13:13'));
    $this->assert(count($results) === 1);
-    $this->assert($results[0]['age'] == 30 && $results[0]['password'] == 'goodbye');
+    $this->assert($results[0]['age'] === '30' && $results[0]['password'] === 'goodbye');
+    $this->assert($results[0]['birthday'] == '2000-09-10 13:13:13');
    
    $results = DB::query("SELECT * FROM accounts WHERE username!=%s", "Charlie's Friend");
-    $this->assert(count($results) === 2);
+    $this->assert(count($results) === 3);
+    
+    $columnList = DB::columnList('accounts');
+    $columnKeys = array_keys($columnList);
+    $this->assert(count($columnList) === 8);
+    $this->assert($columnList['id']['type'] == 'int(11)');
+    $this->assert($columnList['height']['type'] == 'double');
+    $this->assert($columnKeys[5] == 'height');
+    
+    $tablelist = DB::tableList();
+    $this->assert(count($tablelist) === 3);
+    $this->assert($tablelist[0] === 'accounts');
+    
+    $tablelist = null;
+    $tablelist = DB::tableList(DB::$dbName);
+    $this->assert(count($tablelist) === 3);
+    $this->assert($tablelist[0] === 'accounts');
+
+    $date = DB::queryFirstField("SELECT DATE_FORMAT(birthday, '%%m/%%d/%%Y') FROM accounts WHERE username=%s", "Charlie's Friend");
+    $this->assert($date === '09/10/2000');
+
+    $date = DB::queryFirstField("SELECT DATE_FORMAT('2009-10-04 22:23:00', '%m/%d/%Y')");;
+    $this->assert($date === '10/04/2009');
  }
  
-  function test_5_error_handler() {
-    global $error_callback_worked;
+  function test_4_1_query() {
+    DB::insert('accounts', array(
+      'username' => 'newguy',
+      'password' => DB::sqleval("REPEAT('blah', %i)", '3'),
+      'age' => DB::sqleval('171+1'),
+      'height' => 111.15
+    ));
    
-    DB::$error_handler = 'new_error_callback';
-    DB::query("SELET * FROM accounts");
-    $this->assert($error_callback_worked === 1);
+    $row = DB::queryOneRow("SELECT * FROM accounts WHERE password=%s", 'blahblahblah');
+    $this->assert($row['username'] === 'newguy');
+    $this->assert($row['age'] === '172');
+    
+    $true = DB::update('accounts', array(
+      'password' => DB::sqleval("REPEAT('blah', %i)", 4),
+      'favorite_word' => null,
+      ), 'username=%s_name', array('name' => 'newguy'));
+    
+    $row = null;
+    $row = DB::queryOneRow("SELECT * FROM accounts WHERE username=%s", 'newguy');
+    $this->assert($true === true);
+    $this->assert($row['password'] === 'blahblahblahblah');
+    $this->assert($row['favorite_word'] === null);
+    
+    $row = DB::query("SELECT * FROM accounts WHERE password=%s_mypass AND (password=%s_mypass) AND username=%s_myuser", 
+      array('myuser' => 'newguy', 'mypass' => 'blahblahblahblah')
+    );
+    $this->assert(count($row) === 1);
+    $this->assert($row[0]['username'] === 'newguy');
+    $this->assert($row[0]['age'] === '172');
+
+    $row = DB::query("SELECT * FROM accounts WHERE password IN %li AND password IN %li0 AND username=%s", array('blahblahblahblah'), 'newguy');
+    $this->assert(count($row) === 1);
+    $this->assert($row[0]['username'] === 'newguy');
+    $this->assert($row[0]['age'] === '172');
+    
+    $true = DB::query("DELETE FROM accounts WHERE password=%s", 'blahblahblahblah');
+    $this->assert($true === true);
+    $this->assert(DB::affectedRows() === 1);
  }
  
-  function test_6_exception_catch() {
-    DB::$error_handler = '';
-    DB::$throw_exception_on_error = true;
-    try {
-      DB::query("SELET * FROM accounts");
-    } catch(MeekroDBException $e) {
-      $this->assert(substr_count($e->getMessage(), 'You have an error in your SQL syntax'));
-      $this->assert($e->getQuery() === 'SELET * FROM accounts');
-      $exception_was_caught = 1;
-    }
-    $this->assert($exception_was_caught === 1);
+  function test_4_2_delete() {
+    DB::insert('accounts', array(
+      'username' => 'gonesoon',
+      'password' => 'something',
+      'age' => 61,
+      'height' => 199.194
+    ));
    
-    try {
-      DB::insert('`libdb_test`.`accounts`', array(
-        'id' => 2,
-        'username' => 'Another Dude\'s \'Mom"',
-        'password' => 'asdfsdse',
-        'age' => 35,
-        'height' => 555.23
-      ));
-    } catch(MeekroDBException $e) {
-      $this->assert(substr_count($e->getMessage(), 'Duplicate entry'));
-      $exception_was_caught = 2;
-    }
-    $this->assert($exception_was_caught === 2);
+    $ct = DB::queryFirstField("SELECT COUNT(*) FROM accounts WHERE %ha", array('username' => 'gonesoon', 'height' => 199.194));
+    $this->assert(intval($ct) === 1);
+    
+    $ct = DB::queryFirstField("SELECT COUNT(*) FROM accounts WHERE username=%s1 AND height=%d0 AND height=%d", 199.194, 'gonesoon');
+    $this->assert(intval($ct) === 1);
+    
+    DB::delete('accounts', 'username=%s AND age=%i AND height=%d', 'gonesoon', '61', '199.194');
+    $this->assert(DB::affectedRows() === 1);
+    
+    $ct = DB::queryFirstField("SELECT COUNT(*) FROM accounts WHERE username=%s AND height=%d", 'gonesoon', '199.194');
+    $this->assert(intval($ct) === 0);
  }
  
-  function test_7_debugmode_handler() {
-    global $debug_callback_worked;
+  function test_4_3_insertmany() {
+    $ins[] = array(
+      'username' => '1ofmany',
+      'password' => 'something',
+      'age' => 23,
+      'height' => 190.194
+    );
+    $ins[] = array(
+      'password' => 'somethingelse',
+      'username' => '2ofmany',
+      'age' => 25,
+      'height' => 190.194
+    );
+    $ins[] = array(
+      'password' => NULL,
+      'username' => '3ofmany',
+      'age' => 15,
+      'height' => 111.951
+    ); 
    
-    DB::debugMode('my_debug_handler');
-    DB::query("SELECT * FROM accounts WHERE username!=%s", "Charlie's Friend");
+    DB::insert('accounts', $ins);
+    $this->assert(DB::affectedRows() === 3);
    
-    $this->assert($debug_callback_worked === 1);
+    $rows = DB::query("SELECT * FROM accounts WHERE height=%d ORDER BY age ASC", 190.194);
+    $this->assert(count($rows) === 2);
+    $this->assert($rows[0]['username'] === '1ofmany');
+    $this->assert($rows[0]['age'] === '23');
+    $this->assert($rows[1]['age'] === '25');
+    $this->assert($rows[1]['password'] === 'somethingelse');
+    $this->assert($rows[1]['username'] === '2ofmany');
    
-    DB::debugMode(false);
+    $nullrow = DB::queryOneRow("SELECT * FROM accounts WHERE username LIKE %ss", '3ofman');
+    $this->assert($nullrow['password'] === NULL);
+    $this->assert($nullrow['age'] === '15');
  }
  
+  
+  
+  function test_5_insert_blobs() {
+    DB::query("CREATE TABLE `store data` (
+      `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+      `picture` BLOB
+    ) ENGINE = InnoDB");
+
+    $columns = DB::columnList('store data');
+    $this->assert(count($columns) === 2);
+    $this->assert($columns['picture']['type'] === 'blob');
+    $this->assert($columns['picture']['null'] === 'YES');
+    $this->assert($columns['picture']['key'] === '');
+    $this->assert($columns['picture']['default'] === NULL);
+    $this->assert($columns['picture']['extra'] === '');
+    
+    $smile = file_get_contents(__DIR__ . '/smile1.jpg');
+    DB::insert('store data', array(
+      'picture' => $smile,
+    ));
+    DB::queryOneRow("INSERT INTO %b (picture) VALUES (%s)", 'store data', $smile);
+    
+    $getsmile = DB::queryFirstField("SELECT picture FROM %b WHERE id=1", 'store data');
+    $getsmile2 = DB::queryFirstField("SELECT picture FROM %b WHERE id=2", 'store data');
+    $this->assert($smile === $getsmile);
+    $this->assert($smile === $getsmile2);
+  }
+  
+  function test_6_insert_ignore() {
+    DB::insertIgnore('accounts', array(
+      'id' => 1, //duplicate primary key
+      'username' => 'gonesoon',
+      'password' => 'something',
+      'age' => 61,
+      'height' => 199.194
+    ));
+  }
+  
+  function test_7_insert_update() {
+    $true = DB::insertUpdate('accounts', array(
+      'id' => 2, //duplicate primary key
+      'username' => 'gonesoon',
+      'password' => 'something',
+      'age' => 61,
+      'height' => 199.194
+    ), 'age = age + %i', 1);
+    
+    $this->assert($true === true);
+    $this->assert(DB::affectedRows() === 2); // a quirk of MySQL, even though only 1 row was updated
+    
+    $result = DB::query("SELECT * FROM accounts WHERE age = %i", 16);
+    $this->assert(count($result) === 1);
+    $this->assert($result[0]['height'] === '10.371');
+    
+    DB::insertUpdate('accounts', array(
+      'id' => 2, //duplicate primary key
+      'username' => 'blahblahdude',
+      'age' => 233,
+      'height' => 199.194
+    ));
+    
+    $result = DB::query("SELECT * FROM accounts WHERE age = %i", 233);
+    $this->assert(count($result) === 1);
+    $this->assert($result[0]['height'] === '199.194');
+    $this->assert($result[0]['username'] === 'blahblahdude');
+    
+    DB::insertUpdate('accounts', array(
+      'id' => 2, //duplicate primary key
+      'username' => 'gonesoon',
+      'password' => 'something',
+      'age' => 61,
+      'height' => 199.194
+    ), array(
+      'age' => 74,
+    ));
+    
+    $result = DB::query("SELECT * FROM accounts WHERE age = %i", 74);
+    $this->assert(count($result) === 1);
+    $this->assert($result[0]['height'] === '199.194');
+    $this->assert($result[0]['username'] === 'blahblahdude');
+    
+    $multiples[] = array(
+      'id' => 3, //duplicate primary key
+      'username' => 'gonesoon',
+      'password' => 'something',
+      'age' => 61,
+      'height' => 199.194
+    );
+    $multiples[] = array(
+      'id' => 1, //duplicate primary key
+      'username' => 'gonesoon',
+      'password' => 'something',
+      'age' => 61,
+      'height' => 199.194
+    );
+    
+    DB::insertUpdate('accounts', $multiples, array('age' => 914));
+    $this->assert(DB::affectedRows() === 4);
+    
+    $result = DB::query("SELECT * FROM accounts WHERE age=914 ORDER BY id ASC");
+    $this->assert(count($result) === 2);
+    $this->assert($result[0]['username'] === 'Abe');
+    $this->assert($result[1]['username'] === 'Charlie\'s Friend');
+    
+    $true = DB::query("UPDATE accounts SET age=15, username='Bart' WHERE age=%i", 74);
+    $this->assert($true === true);
+    $this->assert(DB::affectedRows() === 1);
+  }
+  
+  function test_8_lb() {
+    $data = array(
+      'username' => 'vookoo',
+      'password' => 'dookoo',
+    );
+    
+    $true = DB::query("INSERT into accounts %lb VALUES %ls", array_keys($data), array_values($data));
+    $result = DB::query("SELECT * FROM accounts WHERE username=%s", 'vookoo');
+    $this->assert($true === true);
+    $this->assert(count($result) === 1);
+    $this->assert($result[0]['password'] === 'dookoo');
+  }
+
+  function test_9_fullcolumns() {
+    $true = DB::insert('profile', array(
+      'id' => 1,
+      'signature' => 'u_suck'
+    ));
+    DB::query("UPDATE accounts SET profile_id=1 WHERE id=2");
+
+    $r = DB::queryFullColumns("SELECT accounts.*, profile.*, 1+1 FROM accounts
+      INNER JOIN profile ON accounts.profile_id=profile.id");
+
+    $this->assert($true === true);
+    $this->assert(count($r) === 1);
+    $this->assert($r[0]['accounts.id'] === '2');
+    $this->assert($r[0]['profile.id'] === '1');
+    $this->assert($r[0]['profile.signature'] === 'u_suck');
+    $this->assert($r[0]['1+1'] === '2');
+  }
+
+  function test_901_updatewithspecialchar() {
+    $data = 'www.mysite.com/product?s=t-%s-%%3d%%3d%i&RCAID=24322';
+    DB::update('profile', array('signature' => $data), 'id=%i', 1);
+    $signature = DB::queryFirstField("SELECT signature FROM profile WHERE id=%i", 1);
+    $this->assert($signature === $data);
+
+    DB::update('profile',array('signature'=> "%li "),"id = %d",1);
+    $signature = DB::queryFirstField("SELECT signature FROM profile WHERE id=%i", 1);
+    $this->assert($signature === "%li ");
+  }
+
+  function test_902_faketable() {
+    DB::insert('fake%s_table', array('name' => 'karen'));
+    $count = DB::queryFirstField("SELECT COUNT(*) FROM %b", 'fake%s_table');
+    $this->assert($count === '1');
+    DB::update('fake%s_table', array('name' => 'haren%s'), 'name=%s_name', array('name' => 'karen'));
+    DB::delete('fake%s_table', 'name=%s0', 'haren%s');
+    $count = DB::queryFirstField("SELECT COUNT(*) FROM %b", 'fake%s_table');
+    $this->assert($count === '0');
+  }
+
+  function test_10_parse() {
+    $parsed_query = DB::parse("SELECT * FROM %b WHERE id=%i AND name=%s", 'accounts', 5, 'Joe');
+    $correct_query = "SELECT * FROM `accounts` WHERE id=5 AND name='Joe'";
+    $this->assert($parsed_query === $correct_query);
+
+    $parsed_query = DB::parse("SELECT DATE_FORMAT(birthday, '%%Y-%%M-%%d %%h:%%i:%%s') AS mydate FROM accounts WHERE id=%i", 5);
+    $correct_query = "SELECT DATE_FORMAT(birthday, '%Y-%M-%d %h:%i:%s') AS mydate FROM accounts WHERE id=5";
+    $this->assert($parsed_query === $correct_query);
+  }
+
+
+
 }


--- a/simpletest/CallTest.php
+++ b/simpletest/CallTest.php
@@ -0,0 +1,17 @@
+<?php
+class CallTest extends SimpleTest {
+  function test_1_create_procedure() {
+    DB::query("DROP PROCEDURE IF EXISTS myProc");
+    DB::query("CREATE PROCEDURE myProc()
+    BEGIN
+      SELECT * FROM accounts;
+    END");
+  }
+
+  function test_2_run_procedure() {
+    $r = DB::query("CALL myProc()");
+    $this->assert($r[0]['username'] === 'Abe');
+    $this->assert($r[2]['age'] === '914');
+  }
+
+}
--- a/simpletest/HookTest.php
+++ b/simpletest/HookTest.php
@@ -0,0 +1,287 @@
+<?php
+
+function my_error_handler($hash) {
+  global $error_callback_worked;
+  if (substr_count($hash['error'], 'You have an error in your SQL syntax')) $error_callback_worked = 1;
+  return false;
+}
+
+function my_success_handler($hash) {
+  global $debug_callback_worked;
+  if (substr_count($hash['query'], 'SELECT')) $debug_callback_worked = 1;
+  return false;
+}
+
+
+class HookTest extends SimpleTest {
+  static function static_error_callback($hash) {
+    global $static_error_callback_worked;
+    if (substr_count($hash['error'], 'You have an error in your SQL syntax')) $static_error_callback_worked = 1;
+    return false;
+  }
+
+  function nonstatic_error_callback($hash) {
+    global $nonstatic_error_callback_worked;
+    if (substr_count($hash['error'], 'You have an error in your SQL syntax')) $nonstatic_error_callback_worked = 1;
+    return false;
+  }
+
+  function test_1_error_handler() {
+    global $error_callback_worked, $static_error_callback_worked, $nonstatic_error_callback_worked;
+    
+    DB::addHook('run_failed', 'my_error_handler');
+    DB::query("SELET * FROM accounts");
+    $this->assert($error_callback_worked === 1);
+    DB::removeHooks('run_failed');
+
+    DB::addHook('run_failed', array('HookTest', 'static_error_callback'));
+    DB::query("SELET * FROM accounts");
+    $this->assert($static_error_callback_worked === 1);
+    DB::removeHooks('run_failed');
+
+    DB::addHook('run_failed', array($this, 'nonstatic_error_callback'));
+    DB::query("SELET * FROM accounts");
+    $this->assert($nonstatic_error_callback_worked === 1);
+    DB::removeHooks('run_failed');
+  }
+  
+  function test_2_exception_catch() {
+    $dbname = DB::$dbName;
+    try {
+      DB::query("SELET * FROM accounts");
+    } catch(MeekroDBException $e) {
+      $this->assert(substr_count($e->getMessage(), 'You have an error in your SQL syntax'));
+      $this->assert($e->getQuery() === 'SELET * FROM accounts');
+      $exception_was_caught = 1;
+    }
+    $this->assert($exception_was_caught === 1);
+    $this->assert(DB::lastQuery() === 'SELET * FROM accounts');
+    
+    try {
+      DB::insert("`$dbname`.`accounts`", array(
+        'id' => 2,
+        'username' => 'Another Dude\'s \'Mom"',
+        'password' => 'asdfsdse',
+        'age' => 35,
+        'height' => 555.23
+      ));
+    } catch(MeekroDBException $e) {
+      $this->assert(substr_count($e->getMessage(), 'Duplicate entry'));
+      $exception_was_caught = 2;
+    }
+    $this->assert($exception_was_caught === 2);
+  }
+  
+  function test_3_success_handler() {
+    global $debug_callback_worked;
+    
+    DB::addHook('run_success', 'my_success_handler');
+    DB::query("SELECT * FROM accounts WHERE username!=%s", "Charlie's Friend");
+    $this->assert($debug_callback_worked === 1);
+    DB::removeHooks('run_success');
+  }
+
+  function test_4_error_handler() {
+    global $anonymous_error_callback_worked;
+    
+    $error_handler = function($hash) {
+      global $anonymous_error_callback_worked;
+      if (substr_count($hash['error'], 'You have an error in your SQL syntax')) {
+        $anonymous_error_callback_worked = 1;
+      }
+      return false;
+    };
+    DB::addHook('run_failed', $error_handler);
+    DB::query("SELET * FROM accounts");
+    $this->assert($anonymous_error_callback_worked === 1);
+    DB::removeHooks('run_failed');
+  }
+
+  function test_5_post_run_success() {
+    $callback_worked = false;
+
+    $fn = function($hash) use (&$callback_worked) {
+      if (!isset($hash['error']) && !isset($hash['exception'])) {
+        $callback_worked = true;
+      }
+    };
+
+    DB::addHook('post_run', $fn);
+    DB::query("SELECT * FROM accounts WHERE username!=%s", "Charlie's Friend");
+    $this->assert($callback_worked);
+    DB::removeHooks('post_run');
+  }
+
+  function test_6_post_run_failed() {
+    $callback_worked = false;
+
+    $fn = function($hash) use (&$callback_worked) {
+      if ($hash['error'] && $hash['exception']) {
+        $expected_query = "SELEC * FROM accounts WHERE username!='Charlie\'s Friend'";
+        $expected_error = "error in your SQL syntax";
+        if ($hash['exception']->getQuery() == $expected_query && substr_count($hash['error'], $expected_error)) {
+          $callback_worked = true;
+        }
+      }
+    };
+
+    DB::addHook('post_run', $fn);
+    DB::addHook('run_failed', function() { return false; }); // disable exception throwing
+    DB::query("SELEC * FROM accounts WHERE username!=%s", "Charlie's Friend");
+    $this->assert($callback_worked);
+    DB::removeHooks('post_run');
+    DB::removeHooks('run_failed');
+  }
+
+  function test_7_pre_run() {
+    $callback_worked = false;
+
+    $fn = function($args) { return str_replace('SLCT', 'SELET', $args['query']); };
+    $fn2 = function($args) { return str_replace('SELET', 'SELECT', $args['query']); };
+    $fn3 = function($args) use (&$callback_worked) { $callback_worked = true; };
+
+    DB::addHook('pre_run', $fn);
+    DB::addHook('pre_run', $fn2);
+    $last_hook = DB::addHook('pre_run', $fn3);
+    $results = DB::query("SLCT * FROM accounts WHERE username!=%s", "Charlie's Friend");
+    $this->assert(count($results) == 4);
+    $this->assert($callback_worked);
+
+    $callback_worked = false;
+    DB::removeHook('pre_run', $last_hook);
+    $results = DB::query("SLCT * FROM accounts WHERE username!=%s", "Charlie's Friend");
+    $this->assert(count($results) == 4);
+    $this->assert(!$callback_worked);
+    
+    DB::removeHooks('pre_run');
+  }
+
+  function test_8_pre_parse() {
+    $callback_worked = false;
+
+    $fn = function($args) { 
+      $args['query'] = str_replace('SLCT', 'SELECT', $args['query']);
+      return array($args['query'], $args['args']);
+    };
+    $fn2 = function($args) { 
+      $args['args'][0] = '1ofmany';
+      return array($args['query'], $args['args']);
+    };
+    $fn3 = function() use (&$callback_worked) {
+      $callback_worked = true;
+    };
+
+    DB::addHook('pre_parse', $fn);
+    DB::addHook('pre_parse', $fn2);
+    DB::addHook('pre_parse', $fn3);
+    $row = DB::queryFirstRow("SLCT * FROM accounts WHERE username=%s", "asdf");
+    $this->assert($row['password'] == 'something');
+    $this->assert($callback_worked);
+    DB::removeHooks('pre_parse');
+  }
+
+  function test_9_enough_args() {
+    $error_worked = false;
+
+    try {
+      DB::query("SELECT * FROM accounts WHERE id=%i AND username=%s", 1);
+    } catch (MeekroDBException $e) {
+      if ($e->getMessage() == 'Expected 2 args, but only got 1!') {
+        $error_worked = true;
+      }
+    }
+
+    $this->assert($error_worked);
+  }
+
+  function test_10_named_keys_present() {
+    $error_worked = false;
+
+    try {
+      DB::query("SELECT * FROM accounts WHERE id=%i_id AND username=%s_username", array('username' => 'asdf'));
+    } catch (MeekroDBException $e) {
+      if ($e->getMessage() == "Couldn't find named arg id!") {
+        $error_worked = true;
+      }
+    }
+
+    $this->assert($error_worked);
+  }
+
+  function test_11_expect_array() {
+    $error_worked = false;
+
+    try {
+      DB::query("SELECT * FROM accounts WHERE id IN %li", 5);
+    } catch (MeekroDBException $e) {
+      if ($e->getMessage() == "Expected an array for arg 0 but didn't get one!") {
+        $error_worked = true;
+      }
+    }
+
+    $this->assert($error_worked);
+  }
+
+  function test_12_named_keys_without_array() {
+    $error_worked = false;
+
+    try {
+      DB::query("SELECT * FROM accounts WHERE id=%i_named", 1);
+    } catch (MeekroDBException $e) {
+      if ($e->getMessage() == "If you use named args, you must pass an assoc array of args!") {
+        $error_worked = true;
+      }
+    }
+
+    $this->assert($error_worked);
+  }
+
+  function test_13_mix_named_numbered_args() {
+    $error_worked = false;
+
+    try {
+      DB::query("SELECT * FROM accounts WHERE id=%i_named AND username=%s", array('named' => 1));
+    } catch (MeekroDBException $e) {
+      if ($e->getMessage() == "You can't mix named and numbered args!") {
+        $error_worked = true;
+      }
+    }
+
+    $this->assert($error_worked);
+  }
+
+  function test_14_arrays_not_empty() {
+    $error_worked = false;
+
+    try {
+      DB::query("SELECT * FROM accounts WHERE id IN %li", array());
+    } catch (MeekroDBException $e) {
+      if ($e->getMessage() == "Arg 0 array can't be empty!") {
+        $error_worked = true;
+      }
+    }
+
+    $this->assert($error_worked);
+  }
+
+  function test_15_named_array_not_empty() {
+    $error_worked = false;
+
+    try {
+      DB::query("SELECT * FROM accounts WHERE id IN %li_ids", array('ids' => array()));
+    } catch (MeekroDBException $e) {
+      if ($e->getMessage() == "Arg ids array can't be empty!") {
+        $error_worked = true;
+      }
+    }
+
+    $this->assert($error_worked);
+  }
+
+
+
+
+
+}
+
+?>
--- a/simpletest/ObjectTest.php
+++ b/simpletest/ObjectTest.php
@@ -0,0 +1,314 @@
+<?php
+class ObjectTest extends SimpleTest {
+  public $mdb;
+  
+  function __construct() {
+    $this->mdb = new MeekroDB();
+    
+    foreach ($this->mdb->tableList() as $table) {
+      $this->mdb->query("DROP TABLE %b", $table);
+    }
+  }
+  
+  
+  function test_1_create_table() {
+    $this->mdb->query("CREATE TABLE `accounts` (
+    `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+    `username` VARCHAR( 255 ) NOT NULL ,
+    `password` VARCHAR( 255 ) NULL ,
+    `age` INT NOT NULL DEFAULT '10',
+    `height` DOUBLE NOT NULL DEFAULT '10.0',
+    `favorite_word` VARCHAR( 255 ) NULL DEFAULT 'hi'
+    ) ENGINE = InnoDB");
+  }
+  
+  function test_1_5_empty_table() {
+    $counter = $this->mdb->queryFirstField("SELECT COUNT(*) FROM accounts");
+    $this->assert($counter === strval(0));
+    
+    $row = $this->mdb->queryFirstRow("SELECT * FROM accounts");
+    $this->assert($row === null);
+    
+    $field = $this->mdb->queryFirstField("SELECT * FROM accounts");
+    $this->assert($field === null);
+    
+    $field = $this->mdb->queryOneField('nothere', "SELECT * FROM accounts");
+    $this->assert($field === null);
+    
+    $column = $this->mdb->queryFirstColumn("SELECT * FROM accounts");
+    $this->assert(is_array($column) && count($column) === 0);
+    
+    $column = $this->mdb->queryOneColumn('nothere', "SELECT * FROM accounts"); //TODO: is this what we want?
+    $this->assert(is_array($column) && count($column) === 0);
+  }
+  
+  function test_2_insert_row() {
+    $this->mdb->insert('accounts', array(
+      'username' => 'Abe',
+      'password' => 'hello'
+    ));
+    
+    $this->assert($this->mdb->affectedRows() === 1);
+    
+    $counter = $this->mdb->queryFirstField("SELECT COUNT(*) FROM accounts");
+    $this->assert($counter === strval(1));
+  }
+  
+  function test_3_more_inserts() {
+    $this->mdb->insert('`accounts`', array(
+      'username' => 'Bart',
+      'password' => 'hello',
+      'age' => 15,
+      'height' => 10.371
+    ));
+    $dbname = $this->mdb->dbName;
+    $this->mdb->insert("`$dbname`.`accounts`", array(
+      'username' => 'Charlie\'s Friend',
+      'password' => 'goodbye',
+      'age' => 30,
+      'height' => 155.23,
+      'favorite_word' => null,
+    ));
+    
+    $this->assert($this->mdb->insertId() === 3);
+    
+    $counter = $this->mdb->queryFirstField("SELECT COUNT(*) FROM accounts");
+    $this->assert($counter === strval(3));
+    
+    $password = $this->mdb->queryFirstField("SELECT password FROM accounts WHERE favorite_word IS NULL");
+    $this->assert($password === 'goodbye');
+    
+    $this->mdb->param_char = '###';
+    $bart = $this->mdb->queryFirstRow("SELECT * FROM accounts WHERE age IN ###li AND height IN ###ld AND username IN ###ls", 
+      array(15, 25), array(10.371, 150.123), array('Bart', 'Barts'));
+    $this->assert($bart['username'] === 'Bart');
+    $this->mdb->param_char = '%';
+    
+    $charlie_password = $this->mdb->queryFirstField("SELECT password FROM accounts WHERE username IN %ls AND username = %s", 
+      array('Charlie', 'Charlie\'s Friend'), 'Charlie\'s Friend');
+    $this->assert($charlie_password === 'goodbye');
+    
+    $charlie_password = $this->mdb->queryOneField('password', "SELECT * FROM accounts WHERE username IN %ls AND username = %s", 
+      array('Charlie', 'Charlie\'s Friend'), 'Charlie\'s Friend');
+    $this->assert($charlie_password === 'goodbye');
+    
+    $passwords = $this->mdb->queryFirstColumn("SELECT password FROM accounts WHERE username=%s", 'Bart');
+    $this->assert(count($passwords) === 1);
+    $this->assert($passwords[0] === 'hello');
+    
+    $username = $password = $age = null;
+    list($age, $username, $password) = $this->mdb->queryOneList("SELECT age,username,password FROM accounts WHERE username=%s", 'Bart');
+    $this->assert($username === 'Bart');
+    $this->assert($password === 'hello');
+    $this->assert($age == 15);
+    
+    $mysqli_result = $this->mdb->queryRaw("SELECT * FROM accounts WHERE favorite_word IS NULL");
+    $this->assert($mysqli_result instanceof MySQLi_Result);
+    $row = $mysqli_result->fetch_assoc();
+    $this->assert($row['password'] === 'goodbye');
+    $this->assert($mysqli_result->fetch_assoc() === null);
+  }
+  
+  function test_4_query() {
+    $results = $this->mdb->query("SELECT * FROM accounts WHERE username=%s", 'Charlie\'s Friend');
+    $this->assert(count($results) === 1);
+    $this->assert($results[0]['age'] == 30 && $results[0]['password'] == 'goodbye');
+    
+    $results = $this->mdb->query("SELECT * FROM accounts WHERE username!=%s", "Charlie's Friend");
+    $this->assert(count($results) === 2);
+    
+    $columnList = $this->mdb->columnList('accounts');
+    $columnKeys = array_keys($columnList);
+    $this->assert(count($columnList) === 6);
+    $this->assert($columnList['id']['type'] == 'int(11)');
+    $this->assert($columnList['height']['type'] == 'double');
+    $this->assert($columnKeys[4] == 'height');
+    
+    $tablelist = $this->mdb->tableList();
+    $this->assert(count($tablelist) === 1);
+    $this->assert($tablelist[0] === 'accounts');
+    
+    $tablelist = null;
+    $tablelist = $this->mdb->tableList($this->mdb->dbName);
+    $this->assert(count($tablelist) === 1);
+    $this->assert($tablelist[0] === 'accounts');
+  }
+  
+  function test_4_1_query() {
+    $this->mdb->insert('accounts', array(
+      'username' => 'newguy',
+      'password' => $this->mdb->sqleval("REPEAT('blah', %i)", '3'),
+      'age' => $this->mdb->sqleval('171+1'),
+      'height' => 111.15
+    ));
+    
+    $row = $this->mdb->queryOneRow("SELECT * FROM accounts WHERE password=%s", 'blahblahblah');
+    $this->assert($row['username'] === 'newguy');
+    $this->assert($row['age'] === '172');
+    
+    $this->mdb->update('accounts', array(
+      'password' => $this->mdb->sqleval("REPEAT('blah', %i)", 4),
+      'favorite_word' => null,
+      ), 'username=%s', 'newguy');
+    
+    $row = null;
+    $row = $this->mdb->queryOneRow("SELECT * FROM accounts WHERE username=%s", 'newguy');
+    $this->assert($row['password'] === 'blahblahblahblah');
+    $this->assert($row['favorite_word'] === null);
+    
+    $this->mdb->query("DELETE FROM accounts WHERE password=%s", 'blahblahblahblah');
+    $this->assert($this->mdb->affectedRows() === 1);
+  }
+  
+  function test_4_2_delete() {
+    $this->mdb->insert('accounts', array(
+      'username' => 'gonesoon',
+      'password' => 'something',
+      'age' => 61,
+      'height' => 199.194
+    ));
+    
+    $ct = $this->mdb->queryFirstField("SELECT COUNT(*) FROM accounts WHERE username=%s AND height=%d", 'gonesoon', 199.194);
+    $this->assert(intval($ct) === 1);
+    
+    $ct = $this->mdb->queryFirstField("SELECT COUNT(*) FROM accounts WHERE username=%s1 AND height=%d0 AND height=%d", 199.194, 'gonesoon');
+    $this->assert(intval($ct) === 1);
+    
+    $this->mdb->delete('accounts', 'username=%s AND age=%i AND height=%d', 'gonesoon', '61', '199.194');
+    $this->assert($this->mdb->affectedRows() === 1);
+    
+    $ct = $this->mdb->queryFirstField("SELECT COUNT(*) FROM accounts WHERE username=%s AND height=%d", 'gonesoon', '199.194');
+    $this->assert(intval($ct) === 0);
+  }
+  
+  function test_4_3_insertmany() {
+    $ins[] = array(
+      'username' => '1ofmany',
+      'password' => 'something',
+      'age' => 23,
+      'height' => 190.194
+    );
+    $ins[] = array(
+      'password' => 'somethingelse',
+      'username' => '2ofmany',
+      'age' => 25,
+      'height' => 190.194
+    );
+    
+    $this->mdb->insert('accounts', $ins);
+    $this->assert($this->mdb->affectedRows() === 2);
+    
+    $rows = $this->mdb->query("SELECT * FROM accounts WHERE height=%d ORDER BY age ASC", 190.194);
+    $this->assert(count($rows) === 2);
+    $this->assert($rows[0]['username'] === '1ofmany');
+    $this->assert($rows[0]['age'] === '23');
+    $this->assert($rows[1]['age'] === '25');
+    $this->assert($rows[1]['password'] === 'somethingelse');
+    $this->assert($rows[1]['username'] === '2ofmany');
+    
+  }
+  
+  
+  
+  function test_5_insert_blobs() {
+    $this->mdb->query("CREATE TABLE `storedata` (
+      `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+      `picture` BLOB
+    ) ENGINE = InnoDB");
+    
+    
+    $smile = file_get_contents(__DIR__ . '/smile1.jpg');
+    $this->mdb->insert('storedata', array(
+      'picture' => $smile,
+    ));
+    $this->mdb->query("INSERT INTO storedata (picture) VALUES (%s)", $smile);
+    
+    $getsmile = $this->mdb->queryFirstField("SELECT picture FROM storedata WHERE id=1");
+    $getsmile2 = $this->mdb->queryFirstField("SELECT picture FROM storedata WHERE id=2");
+    $this->assert($smile === $getsmile);
+    $this->assert($smile === $getsmile2);
+  }
+  
+  function test_6_insert_ignore() {
+    $this->mdb->insertIgnore('accounts', array(
+      'id' => 1, //duplicate primary key
+      'username' => 'gonesoon',
+      'password' => 'something',
+      'age' => 61,
+      'height' => 199.194
+    ));
+  }
+  
+  function test_7_insert_update() {
+    $this->mdb->insertUpdate('accounts', array(
+      'id' => 2, //duplicate primary key
+      'username' => 'gonesoon',
+      'password' => 'something',
+      'age' => 61,
+      'height' => 199.194
+    ), 'age = age + %i', 1);
+    
+    $this->assert($this->mdb->affectedRows() === 2); // a quirk of MySQL, even though only 1 row was updated
+    
+    $result = $this->mdb->query("SELECT * FROM accounts WHERE age = %i", 16);
+    $this->assert(count($result) === 1);
+    $this->assert($result[0]['height'] === '10.371');
+    
+    $this->mdb->insertUpdate('accounts', array(
+      'id' => 2, //duplicate primary key
+      'username' => 'blahblahdude',
+      'age' => 233,
+      'height' => 199.194
+    ));
+    
+    $result = $this->mdb->query("SELECT * FROM accounts WHERE age = %i", 233);
+    $this->assert(count($result) === 1);
+    $this->assert($result[0]['height'] === '199.194');
+    $this->assert($result[0]['username'] === 'blahblahdude');
+    
+    $this->mdb->insertUpdate('accounts', array(
+      'id' => 2, //duplicate primary key
+      'username' => 'gonesoon',
+      'password' => 'something',
+      'age' => 61,
+      'height' => 199.194
+    ), array(
+      'age' => 74,
+    ));
+    
+    $result = $this->mdb->query("SELECT * FROM accounts WHERE age = %i", 74);
+    $this->assert(count($result) === 1);
+    $this->assert($result[0]['height'] === '199.194');
+    $this->assert($result[0]['username'] === 'blahblahdude');
+    
+    $multiples[] = array(
+      'id' => 3, //duplicate primary key
+      'username' => 'gonesoon',
+      'password' => 'something',
+      'age' => 61,
+      'height' => 199.194
+    );
+    $multiples[] = array(
+      'id' => 1, //duplicate primary key
+      'username' => 'gonesoon',
+      'password' => 'something',
+      'age' => 61,
+      'height' => 199.194
+    );
+    
+    $this->mdb->insertUpdate('accounts', $multiples, array('age' => 914));
+    $this->assert($this->mdb->affectedRows() === 4);
+    
+    $result = $this->mdb->query("SELECT * FROM accounts WHERE age=914 ORDER BY id ASC");
+    $this->assert(count($result) === 2);
+    $this->assert($result[0]['username'] === 'Abe');
+    $this->assert($result[1]['username'] === 'Charlie\'s Friend');
+    
+    $this->mdb->query("UPDATE accounts SET age=15, username='Bart' WHERE age=%i", 74);
+    $this->assert($this->mdb->affectedRows() === 1);
+  }
+
+}
+
+
+?>
--- a/simpletest/TransactionTest.php
+++ b/simpletest/TransactionTest.php
@@ -0,0 +1,30 @@
+<?php
+class TransactionTest extends SimpleTest {
+  function test_1_transactions() {
+    DB::$nested_transactions = false;
+    
+    DB::query("UPDATE accounts SET age=%i WHERE username=%s", 600, 'Abe');
+    
+    $depth = DB::startTransaction();
+    $this->assert($depth === 1);
+    
+    DB::query("UPDATE accounts SET age=%i WHERE username=%s", 700, 'Abe');
+    $depth = DB::startTransaction();
+    $this->assert($depth === 1);
+    
+    DB::query("UPDATE accounts SET age=%i WHERE username=%s", 800, 'Abe');
+    $depth = DB::rollback();
+    $this->assert($depth === 0);
+    
+    $age = DB::queryFirstField("SELECT age FROM accounts WHERE username=%s", 'Abe');
+    $this->assert($age == 700);
+    
+    $depth = DB::rollback();
+    $this->assert($depth === 0);
+    
+    $age = DB::queryFirstField("SELECT age FROM accounts WHERE username=%s", 'Abe');
+    $this->assert($age == 700);
+  }
+  
+}
+?>
--- a/simpletest/TransactionTest_55.php
+++ b/simpletest/TransactionTest_55.php
@@ -0,0 +1,85 @@
+<?php
+class TransactionTest_55 extends SimpleTest {
+  function test_1_transactions() {
+    DB::$nested_transactions = true;
+    
+    $depth = DB::startTransaction();
+      $this->assert($depth === 1);
+      DB::query("UPDATE accounts SET age=%i WHERE username=%s", 700, 'Abe');
+      
+      $depth = DB::startTransaction();
+        $this->assert($depth === 2);
+        DB::query("UPDATE accounts SET age=%i WHERE username=%s", 800, 'Abe');
+        
+        $depth = DB::startTransaction();
+          $this->assert($depth === 3);
+          $this->assert(DB::transactionDepth() === 3);
+          DB::query("UPDATE accounts SET age=%i WHERE username=%s", 500, 'Abe');
+        $depth = DB::commit();
+        
+        $this->assert($depth === 2);
+        
+        $age = DB::queryFirstField("SELECT age FROM accounts WHERE username=%s", 'Abe');
+        $this->assert($age == 500);
+        
+      $depth = DB::rollback();
+      $this->assert($depth === 1);
+      
+      $age = DB::queryFirstField("SELECT age FROM accounts WHERE username=%s", 'Abe');
+      $this->assert($age == 700);
+    
+    $depth = DB::commit();
+    $this->assert($depth === 0);
+    
+    $age = DB::queryFirstField("SELECT age FROM accounts WHERE username=%s", 'Abe');
+    $this->assert($age == 700);
+    
+    
+    DB::$nested_transactions = false;
+  }
+  
+  function test_2_transactions() {
+    DB::$nested_transactions = true;
+    
+    DB::query("UPDATE accounts SET age=%i WHERE username=%s", 600, 'Abe');
+    
+    DB::startTransaction();
+    DB::query("UPDATE accounts SET age=%i WHERE username=%s", 700, 'Abe');
+    DB::startTransaction();
+    DB::query("UPDATE accounts SET age=%i WHERE username=%s", 800, 'Abe');
+    DB::rollback();
+    
+    $age = DB::queryFirstField("SELECT age FROM accounts WHERE username=%s", 'Abe');
+    $this->assert($age == 700);
+    
+    DB::rollback();
+    
+    $age = DB::queryFirstField("SELECT age FROM accounts WHERE username=%s", 'Abe');
+    $this->assert($age == 600);
+    
+    DB::$nested_transactions = false;
+  }
+  
+  function test_3_transaction_rollback_all() {
+    DB::$nested_transactions = true;
+    
+    DB::query("UPDATE accounts SET age=%i WHERE username=%s", 200, 'Abe');
+    
+    $depth = DB::startTransaction();
+    $this->assert($depth === 1);
+    DB::query("UPDATE accounts SET age=%i WHERE username=%s", 300, 'Abe');
+    $depth = DB::startTransaction();
+    $this->assert($depth === 2);
+    
+    DB::query("UPDATE accounts SET age=%i WHERE username=%s", 400, 'Abe');
+    $depth = DB::rollback(true);
+    $this->assert($depth === 0);
+    
+    $age = DB::queryFirstField("SELECT age FROM accounts WHERE username=%s", 'Abe');
+    $this->assert($age == 200);
+    
+    DB::$nested_transactions = false;
+  }
+  
+}
+?>
--- a/simpletest/WalkTest.php
+++ b/simpletest/WalkTest.php
@@ -0,0 +1,64 @@
+<?php
+
+class WalkTest extends SimpleTest {
+  function test_1_walk() {
+    $Walk = DB::queryWalk("SELECT * FROM accounts");
+
+    $results = array();
+    while ($row = $Walk->next()) {
+      $results[] = $row;
+    }
+
+    $this->assert(count($results) == 8);
+    $this->assert($results[7]['username'] == 'vookoo');
+  }
+  
+  function test_2_walk_empty() {
+    $Walk = DB::queryWalk("SELECT * FROM accounts WHERE id>100");
+
+    $results = array();
+    while ($row = $Walk->next()) {
+      $results[] = $row;
+    }
+
+    $this->assert(count($results) == 0);
+  }
+
+  function test_3_walk_insert() {
+    $Walk = DB::queryWalk("INSERT INTO profile (id) VALUES (100)");
+
+    $results = array();
+    while ($row = $Walk->next()) {
+      $results[] = $row;
+    }
+
+    $this->assert(count($results) == 0);
+
+    DB::query("DELETE FROM profile WHERE id=100");
+  }
+
+  function test_4_walk_incomplete() {
+    $Walk = DB::queryWalk("SELECT * FROM accounts");
+    $Walk->next();
+    unset($Walk);
+
+    // if $Walk hasn't been properly freed, this will produce an out of sync error
+    DB::query("SELECT * FROM accounts");
+  }
+
+  function test_5_walk_error() {
+    $Walk = DB::queryWalk("SELECT * FROM accounts");
+    $Walk->next();
+    
+    try {
+      // this will produce an out of sync error
+      DB::query("SELECT * FROM accounts");
+    } catch (MeekroDBException $e) {
+      if (substr_count($e->getMessage(), 'out of sync')) {
+        $exception_was_caught = 1;
+      }
+    }
+
+    $this->assert($exception_was_caught === 1);
+  }
+}
--- a/simpletest/WhereClauseTest.php
+++ b/simpletest/WhereClauseTest.php
@@ -0,0 +1,83 @@
+<?php
+class WhereClauseTest extends SimpleTest {
+  function test_1_basic_where() {
+    $where = new WhereClause('and');
+    $where->add('username=%s', 'Bart');
+    $where->add('password=%s', 'hello');
+    
+    $result = DB::query("SELECT * FROM accounts WHERE %l", $where);
+    $this->assert(count($result) === 1);
+    $this->assert($result[0]['age'] === '15');
+  }
+  
+  function test_2_simple_grouping() {
+    $where = new WhereClause('and');
+    $where->add('password=%s', 'hello');
+    $subclause = $where->addClause('or');
+    $subclause->add('age=%i', 15);
+    $subclause->add('age=%i', 14);
+    
+    $result = DB::query("SELECT * FROM accounts WHERE %l", $where);
+    $this->assert(count($result) === 1);
+    $this->assert($result[0]['age'] === '15');
+  }
+  
+  function test_3_negate_last() {
+    $where = new WhereClause('and');
+    $where->add('password=%s', 'hello');
+    $subclause = $where->addClause('or');
+    $subclause->add('username!=%s', 'Bart');
+    $subclause->negateLast();
+    
+    $result = DB::query("SELECT * FROM accounts WHERE %l", $where);
+    $this->assert(count($result) === 1);
+    $this->assert($result[0]['age'] === '15');
+  }
+  
+  function test_4_negate_last_query() {
+    $where = new WhereClause('and');
+    $where->add('password=%s', 'hello');
+    $subclause = $where->addClause('or');
+    $subclause->add('username!=%s', 'Bart');
+    $where->negateLast();
+    
+    $result = DB::query("SELECT * FROM accounts WHERE %l", $where);
+    $this->assert(count($result) === 1);
+    $this->assert($result[0]['age'] === '15');
+  }
+  
+  function test_5_negate() {
+    $where = new WhereClause('and');
+    $where->add('password=%s', 'hello');
+    $subclause = $where->addClause('or');
+    $subclause->add('username!=%s', 'Bart');
+    $subclause->negate();
+    
+    $result = DB::query("SELECT * FROM accounts WHERE %l", $where);
+    $this->assert(count($result) === 1);
+    $this->assert($result[0]['age'] === '15');
+  }
+
+  function test_6_negate_two() {
+    $where = new WhereClause('and');
+    $where->add('password=%s', 'hello');
+    $where->add('username=%s', 'Bart');
+    $where->negate();
+    
+    $result = DB::query("SELECT * FROM accounts WHERE %l", $where);
+    $this->assert(count($result) === 7);
+  }
+
+  function test_7_or() {
+    $where = new WhereClause('or');
+    $where->add('username=%s', 'Bart');
+    $where->add('username=%s', 'Abe');
+
+    $result = DB::query("SELECT * FROM accounts WHERE %l", $where);
+    $this->assert(count($result) === 2);
+  }
+  
+
+}
+
+?>
--- a/simpletest/smile1.jpg
+++ b/simpletest/smile1.jpg
--- a/simpletest/test.php
+++ b/simpletest/test.php
@@ -1,7 +1,7 @@
 #!/usr/bin/php
 <?php
 class SimpleTest {
-  protected function assert($boolean) {
+  public function assert($boolean) {
    if (! $boolean) $this->fail();
  }

@@ -10,50 +10,66 @@ class SimpleTest {
    debug_print_backtrace();
    die;
  }
-  
-  public static function __listfiles($dir, $regex, $type='files', $rec = false) {
-    $A = array();
-    
-    if (! $dir_handler = @opendir($dir)) return $A;
-    
-    while (false !== ($filename = @readdir($dir_handler))) {
-      if ($filename == '.' || $filename == '..') continue;
-      if ($rec && is_dir("$dir/$filename")) $A = array_merge($A, File::listfiles("$dir/$filename", $regex, $type, true));
-      
-      if (! preg_match($regex, $filename)) continue;
-      if ($type == 'files' && ! is_file("$dir/$filename")) continue;
-      if ($type == 'dirs' && ! is_dir("$dir/$filename")) continue;
-      if ($type == 'symlinks' && ! is_link("$dir/$filename")) continue;
-      
-      $A[] = $dir . DIRECTORY_SEPARATOR . $filename;
-    }
-    return $A;
-  }
-
-  
-
 }

-$files = SimpleTest::__listfiles(dirname(__FILE__), '/^.*php$/i');
-
-$classes_to_test = array();
-foreach ($files as $fullpath) {
-  $filename = basename($fullpath);
-  if ($fullpath == __FILE__) continue;
-  require_once($fullpath);
-  $classes_to_test[] = str_replace('.php', '', $filename);
+function microtime_float()
+{
+    list($usec, $sec) = explode(" ", microtime());
+    return ((float)$usec + (float)$sec);
 }

+ini_set('date.timezone', 'America/Los_Angeles');
+
+error_reporting(E_ALL | E_STRICT);
+require_once __DIR__ . '/../db.class.php';
+require_once __DIR__ . '/test_setup.php'; //test config values go here
+// WARNING: ALL tables in the database will be dropped before the tests, including non-test related tables. 
+DB::$user = $set_db_user;
+DB::$password = $set_password;
+DB::$dbName = $set_db;
+DB::$host = $set_host;
+DB::get(); //connect to mysql
+
+require_once __DIR__ . '/BasicTest.php';
+require_once __DIR__ . '/WalkTest.php';
+require_once __DIR__ . '/CallTest.php';
+require_once __DIR__ . '/ObjectTest.php';
+require_once __DIR__ . '/WhereClauseTest.php';
+require_once __DIR__ . '/HookTest.php';
+require_once __DIR__ . '/TransactionTest.php';
+
+$classes_to_test = array(
+  'BasicTest',
+  'WalkTest',
+  'CallTest',
+  'WhereClauseTest',
+  'ObjectTest',
+  'HookTest',
+  'TransactionTest',
+);
+
+$mysql_version = DB::serverVersion();
+if ($mysql_version >= '5.5') {
+  require_once __DIR__ . '/TransactionTest_55.php';
+  $classes_to_test[] = 'TransactionTest_55';
+} else {
+  echo "MySQL 5.5 not available (version is $mysql_version) -- skipping MySQL 5.5 tests\n";
+}
+
+$time_start = microtime_float();
 foreach ($classes_to_test as $class) {
  $object = new $class();
  
  foreach (get_class_methods($object) as $method) {
-    if (substr($method, 0, 2) == '__') continue;
+    if (substr($method, 0, 4) != 'test') continue;
    echo "Running $class::$method..\n";
    $object->$method();
  }
 }
+$time_end = microtime_float();
+$time = round($time_end - $time_start, 2);

+echo "Completed in $time seconds\n";


 ?>
Author	SHA1	Message	Date
Sergey Tsalkov	ed0b6f040d	DB::$ssl now works even if DB::$ssl['key'] is NULL DB::$connect_flags allows access to flags passed to $mysqli->real_connect() Resolves #82 Resolves #83	2022-03-24 16:58:37 +00:00
Sergey Tsalkov	f82f0cc208	add another queryWalk() test case make sure we're using $is_buffered=false for queryWalk() like we're supposed to	2021-08-14 05:08:41 +00:00
Sergey Tsalkov	7febdbd1f5	since queryRaw() is deprecated, it was a mistake to change its behavior return it to using $is_buffered=true, and restore queryRawUnbuf() for $is_buffered=false both queryRaw() and queryRawUnbuf() are deprecated, and it's recommended that you use queryWalk() instead	2021-08-14 05:02:27 +00:00
Sergey Tsalkov	57b7527a46	fix bug in columnList(), add test	2021-08-08 14:15:19 +00:00
Sergey Tsalkov	e30c240d54	cleanup README, add note about $logfile	2021-06-29 04:31:23 +00:00
Sergey Tsalkov	13f249f200	update readme for new version	2021-06-28 22:37:53 +00:00
Sergey Tsalkov	f7a52ca410	DATE_FORMAT() tests for %% escaping	2021-06-28 22:20:59 +00:00
Sergey Tsalkov	d944430401	drop DBHelper	2021-06-27 05:35:28 +00:00
Sergey Tsalkov	a10b76b2de	cleanup some error-checking code add lots more tests for that code	2021-06-27 03:17:47 +00:00
Sergey Tsalkov	50ed9675f3	fix pre_parse and pre_run hooks add testing for all hooks (roll into previous ErrorTest group)	2021-06-26 00:52:37 +00:00
Sergey Tsalkov	1724b7276b	cleanup MeekroDBWalk a bit	2021-06-25 23:48:44 +00:00
Sergey Tsalkov	aad5cbbbac	cleanup and better test queryWalk()	2021-06-25 18:23:59 +00:00
Sergey Tsalkov	5108480e03	drop unused code	2021-06-25 17:40:41 +00:00
Sergey Tsalkov	cd64dd724b	add tests for queryWalk()	2021-06-25 17:35:39 +00:00
Sergey Tsalkov	15f40efe5d	add DB::queryWalk() -- still untested add DB::lastQuery() (with tests)	2021-06-24 03:05:46 +00:00
Sergey Tsalkov	30f3d9454a	DB::debugMode() is now deprecated (but still works) recommended debug system will use $logfile to log SQL to a file	2021-06-23 21:23:20 +00:00
Sergey Tsalkov	dc21f646af	DB::$logfile can be used to log all queries to either a resource or a file DB::debugMode() is now a shorthand for "DB::$logfile = STDOUT"	2021-06-23 03:05:22 +00:00
Sergey Tsalkov	50fd6ed6d2	actually bring back deprecated methods, keep them for now to maintain backwards compatability	2021-06-23 01:27:03 +00:00
Sergey Tsalkov	6487873c68	new hook-based system for inserting callbacks to run before and after a query debugMode() now works through the new system	2021-06-22 06:01:28 +00:00
Sergey Tsalkov	ac626b0795	simplify parser a bit	2021-06-20 20:53:31 +00:00
Sergey Tsalkov	bac5503d5a	PHP 8 complains when trying to access closed $mysqli object, not sure how to test this properly I don't think we need this test very much, anyway	2021-06-20 03:13:11 +00:00
Sergey Tsalkov	42894b70ae	re-design query parser, new model has cleaner code and allows for %% escaping of % characters	2021-06-20 03:12:15 +00:00
Sergey Tsalkov	20c7acd8a4	DB::parse() lets you generate queries without running them	2021-06-20 02:32:56 +00:00
Sergey Tsalkov	c0f3a7f31d	restore to working in PHP 5.3	2021-06-20 02:32:56 +00:00
Sergey Tsalkov	1d2ad974f8	drop deprecated methods: queryOneRow (alias of queryFirstRow) queryOneList (alias of queryFirstList) queryOneColumn queryOneField	2021-06-20 02:32:56 +00:00
Sergey Tsalkov	2ea4c4c539	__callStatic() should have proper exception thrown if invalid method is used	2021-06-20 02:32:56 +00:00
Sergey Tsalkov	7c1f9bc226	DB::$usenull is removed, it makes no sense in a modern PHP context	2021-06-20 02:32:56 +00:00
Sergey Tsalkov	dab71efacd	DB::columnList() now returns details	2021-06-20 02:28:26 +00:00
Sergey Tsalkov	38545ddb3a	remove more PHP 5.2 cruft, we now require PHP 5.3+	2021-06-20 02:28:26 +00:00
Sergey Tsalkov	0fb0071314	use __callStatic() to clean up code a bit next release will require PHP 5.3+ (up from 5.2)	2021-06-20 02:26:21 +00:00
Sergey Tsalkov	03ff51a997	fix composer.json packagist demands lowercase package names now	2021-01-23 22:27:10 -06:00
Sergey Tsalkov	4ff57845e4	Update README.md Remove old broken link.	2020-07-11 10:23:08 -05:00
Sergey Tsalkov	e8c19ca2f8	clean up update() and delete(), both will now be compatible with named and numbered arguments resolves #54	2020-07-10 01:13:31 +00:00
Sergey Tsalkov	fa46824df1	get_class_vars() is broken in PHP 7.4 with opcache enabled, so stop using it looks like this fix actually works with PHP 5.2 after all, so not dropping backwards compatibility resolves #64	2020-07-10 00:00:27 +00:00
Sergey Tsalkov	226a08611f	small test fix to pass on PHP 7.3	2020-07-09 19:51:28 +00:00
wadih	031901f8b6	Add a warning to prevent accidents (#65 )	2020-07-08 21:19:59 -05:00
Magnus Månsson	30c7343bae	Pre sql handler (#59 ) Add a pre_sql_handler	2020-02-06 22:32:29 -06:00
Magnus Månsson	b99ed41c94	Implemented param char ssb and sse (#58 )	2020-02-06 22:20:53 -06:00
Sergey Tsalkov	18d9ab2337	make sure insertOrReplace() gets valid input, throw an error if it doesn't	2020-01-27 08:45:36 -08:00
Sergey Tsalkov	027681b350	bugfix: strtolower() doesn't work with certain locales, so work around that	2020-01-24 15:42:43 -08:00
Sergey Tsalkov	677d5659bb	Update README.md	2019-01-26 11:46:13 -06:00
Sergey Tsalkov	621f2e7a86	Update README.md	2019-01-26 11:45:50 -06:00
Sergey Tsalkov	6e1c252702	Update README.md	2019-01-26 10:23:50 -06:00
Sergey Tsalkov	8e19d9d6c3	bugfix in WhereClause: negate didn't wrap multiple clauses in extra parens Fixes #41	2017-10-15 19:10:35 +00:00
Sergey Tsalkov	22e49b280e	clarify that project is LGPLv3	2017-10-15 18:20:37 +00:00
Sergey Tsalkov	b41887505d	fix to last commit	2017-10-15 17:56:10 +00:00
Mike Damm	cb10e249b2	Add support for custom unix sockets (#49 ) Add support for custom unix sockets	2017-10-08 21:04:22 -07:00
Sergey Tsalkov	aabc77b116	Update README.md	2016-11-21 17:01:59 -08:00
Sergey Tsalkov	8bef6d6618	fix bug with hhvm	2015-03-04 00:43:54 +00:00
Sergey Tsalkov	da46a1eacc	DB::insert() and the like should use __toString() value for objects whenever possible	2014-11-27 01:30:42 +00:00
Sergey Tsalkov	076a7e2b9b	oops	2014-10-27 02:02:32 +00:00
Sergey Tsalkov	67b24c916d	additional test with %li0	2014-10-27 02:00:21 +00:00
Sergey Tsalkov	29c8e42a09	escape and sanitize could be occasionally useful as public functions	2014-10-27 02:00:21 +00:00
Sergey Tsalkov	6fdcffab24	few minor cleanups to last commit	2014-10-27 02:00:21 +00:00
Sergey Tsalkov	e0660a9368	%? no longer handles arrays and hashes for security purposes those are moved into %l?, %ll?, %hc, %ha, %ho for different uses	2014-10-27 02:00:21 +00:00
Sergey Tsalkov	0474a41a56	functions generally shouldn't keep going after a nonsql error	2014-10-27 02:00:21 +00:00
Sergey Tsalkov	1fe2fdea16	when an instance of MeekroDB is created, its default settings will be those of the static instance	2014-10-27 02:00:20 +00:00
Sergey Tsalkov	83256937b8	make some useful functions public	2014-08-25 20:20:39 -07:00
Sergey Tsalkov	eb36858f1a	columnList() properly escapes table names	2014-06-16 22:40:22 +00:00
Sergey Tsalkov	1d797b306e	bugfix: insert/update type functions don't break when using a param_char other than %	2014-06-14 02:41:06 +00:00
Sergey Tsalkov	7c819bfc24	the connect_options variable lets you set mysqli_options, like a connection timeout	2014-06-14 01:58:51 +00:00
Sergey Tsalkov	1d147e169a	ssl support (still untested)	2014-06-14 01:31:32 +00:00
Sergey Tsalkov	391702700d	clean up static class init syntax a bit	2014-06-14 01:06:05 +00:00
Sergey Tsalkov	37fd169be3	minor bugfix: don't assume that the query results for queryFirstRow() or queryFirstList() will be an array (can also be a bool)	2014-06-14 00:27:38 +00:00
Sergey Tsalkov	7c5c03c576	minor cleanups	2014-06-13 21:19:10 +00:00
Sergey Tsalkov	a0a2f702e2	bugfix: don't crash if nested transactions are enabled, and the first command issued is a start transaction	2014-03-31 01:50:10 -07:00
Sergey Tsalkov	2707bcba7d	minor bugfix: don't drop identical query components in WhereClause (thanks Alexander!)	2013-12-06 11:17:54 -08:00
Sergey Tsalkov	7b0da839de	add yet another test for this weird bug people are reporting tests still all pass, I can't reproduce the bug	2013-11-08 14:14:46 -08:00
Sergey Tsalkov	1d51c2b674	add additional test case for a reported bug where '%s' in data is parsed as a query placeholder I can't reproduce the bug	2013-09-13 22:36:33 -07:00
SergeyTsalkov	de63573e98	Merge pull request #14 from bcash/master Added passthru of mysqli error code to MeekroDBException object	2013-06-30 01:31:12 -07:00
Brian Cash	26fcce650a	Passes mysqli error code to MeekroDBException	2013-06-22 11:56:01 -07:00
Sergey Tsalkov	e403c774c8	Merge branch 'master' of github.com:SergeyTsalkov/meekrodb	2013-06-21 16:27:25 -07:00
Sergey Tsalkov	740ca7bc67	restore %ss to working, add unit test so it won't break again	2013-06-21 16:27:05 -07:00
SergeyTsalkov	7563c660ad	Update readme to include brief installation section	2013-06-09 17:08:20 -06:00
Sergey Tsalkov	3741291f44	add a few more fields to composer.json	2013-06-08 13:55:16 -07:00
Sergey Tsalkov	7e00296b32	add license to composer file	2013-06-08 13:38:26 -07:00
Sergey Tsalkov	e2e95adda2	composer fix	2013-06-08 13:32:01 -07:00
Sergey Tsalkov	34a3de3f84	add composer.json for composer support -- not yet tested	2013-06-08 13:28:27 -07:00
Sergey Tsalkov	cc8dbe47eb	%i should allow big ints on 32 bit systems	2013-06-07 00:03:30 -07:00
SergeyTsalkov	8090f4e7dc	Update README.md	2013-06-05 00:19:36 -07:00
SergeyTsalkov	58e564c3d5	Update README.md	2013-06-05 01:08:41 -06:00
Sergey Tsalkov	253e803160	WhereClause can't have a __toString() method anymore because of how it's handled in combinatino with preparseQueryParams() now	2013-06-05 00:01:10 -07:00
SergeyTsalkov	c05a575be0	Create README.md	2013-06-05 01:01:08 -06:00
Sergey Tsalkov	e61d66fdf8	new DateTime() can be used with insert-like commands, and with %? as well	2013-06-02 19:45:44 -07:00
Sergey Tsalkov	e9a55de0b4	DB::$usenull param can be used to decide whether insert()-like commands insert NULL or empty string for NULL	2013-06-02 19:22:14 -07:00
Sergey Tsalkov	9e4cbc28c1	%t and %lt variables can be used to hold a datetime, which will be formatted to mysql standards	2013-06-02 19:10:28 -07:00
Sergey Tsalkov	b6397a719c	merge freeResult and checkError functions back into queryHelper() since they're only used once	2013-06-02 18:17:59 -07:00
Sergey Tsalkov	65ec35c591	modify WhereClause to hold off on evaluating parameters preparseQueryParams will now receive full WhereClause object and evaluate there	2013-06-02 15:51:58 -07:00
Sergey Tsalkov	1d61a11098	add %? autodetection parameter, simplify functions such as insert() and update() to rely on it	2013-06-02 15:17:14 -07:00
Sergey Tsalkov	ecd5fe190f	clean up query parsing code -- will be necessary for transition to prepared statement approach	2013-06-02 12:52:04 -07:00
Sergey Tsalkov	e94f75fe2a	DB::disconnect() allows easy disconnecting from mysql	2013-03-19 12:02:47 -07:00
Sergey Tsalkov	ce11e65070	successful insert/replace/update/delete will return true	2013-03-19 11:31:50 -07:00
Sergey Tsalkov	6cb757797b	minor fix for calculated columns with fullcolumns	2013-03-19 11:20:20 -07:00
Sergey Tsalkov	027e1529ba	create DB::queryFullColumns() which will supply full column names in the format table.column	2013-02-22 22:11:27 -08:00
Sergey Tsalkov	e03ac71b45	more organization and simplification add queryAllLists() and queryRawUnbuf() methods	2013-02-22 21:28:41 -08:00
Sergey Tsalkov	f89d70e49e	bugfix: can use null value for named or numbered parameters	2013-02-22 16:32:15 -08:00
Sergey Tsalkov	6babe98b11	bugfix: free any extra results so CALL commands don't fail	2013-02-22 16:18:18 -08:00
Sergey Tsalkov	039468f3a3	more cleanups and remove old and unused code	2013-02-22 15:08:08 -08:00
Sergey Tsalkov	5e9507181f	code cleanups	2013-02-22 12:37:11 -08:00
Sergey Tsalkov	7364df36cf	include a formatting error if they pass an array where we're not expecting one	2013-02-22 11:52:18 -08:00
Sergey Tsalkov	7df5c9baa2	update copyright year	2012-09-20 21:05:19 -07:00
Sergey Tsalkov	ed347e841a	verticalslice and reindex cleanups and tests	2012-09-20 20:50:05 -07:00
Sergey Tsalkov	2ffb770f8a	bugfix: don't fail when inserting multiple rows at once, and one of the values is NULL	2012-09-19 14:58:09 -07:00
Sergey Tsalkov	ed9c29fe49	add DB::transactionDepth() for checking how many transactions are active when not using nested transactions, will return 1 or 0	2012-09-18 21:08:28 -07:00
Sergey Tsalkov	9a41bf34a1	a few nested transaction cleanups functionality for committing/rolling back all active transactions	2012-09-18 20:54:39 -07:00
Sergey Tsalkov	24c1b930df	add DBHelper class with functions verticalSlice and reIndex	2012-09-18 20:13:43 -07:00
Sergey Tsalkov	d40bc57dde	add nested transactions (mysql >= 5.5 only)	2012-09-18 19:08:37 -07:00
Sergey Tsalkov	c62fc187ee	quick testing change	2012-09-09 17:31:57 -07:00
Sergey Tsalkov	6b324d1291	using $where is now equivalent to $where->text()	2012-09-09 14:49:43 -07:00
Sergey Tsalkov	5b4e5a959a	fix named parameters	2012-07-22 17:43:34 -07:00
Sergey Tsalkov	7582961ee1	named parameters for queries	2012-07-22 17:29:59 -07:00
Sergey Tsalkov	2d49f4f350	remove backtrace from default error message -- it can leak private information	2012-07-08 13:04:57 -07:00
Sergey Tsalkov	9930fc073a	restore %lb parameter to working, add unit test so it doesn't break again	2012-02-03 17:19:54 -08:00
Sergey Tsalkov	788c506f16	success handler gets "affected" var for affected rows	2012-01-25 13:59:42 -08:00
Sergey Tsalkov	bbf9534326	add execution time to tests	2011-12-24 17:27:53 -08:00
Sergey Tsalkov	1d5844bcc0	major redesign to enable multiple instances via "new MeekroDB()" while preserving full backwards compatability static methods DB::whatever() will still be the recommended method of use, but the new object oriented approach is now available to those who want it	2011-12-24 16:12:13 -08:00
Sergey Tsalkov	34c0f5e0a7	add E_STRICT to tests	2011-12-24 13:07:44 -08:00
Sergey Tsalkov	7825f90080	can now refer to a specific argument in a query e.g. %s2 for the third argument, taken as a string	2011-12-17 19:54:55 -08:00
Sergey Tsalkov	a1f01a4f87	few more fixes and tests for WhereClause	2011-09-23 22:03:15 -07:00
Sergey Tsalkov	80cc78edcd	insertUpdate() can now handle a second array for the update component, or nothing, so it'll re-use the insert array for the update component	2011-09-23 21:29:40 -07:00
Sergey Tsalkov	5050205e58	add insertUpdate() function for "insert ... on duplicate key update" behavior	2011-09-23 19:15:41 -07:00
Sergey Tsalkov	9f3aa571dc	add some simple tests for the WhereClause system, which will now be official and documented	2011-09-23 18:44:34 -07:00
Sergey Tsalkov	a2800ef04b	add insertIgnore() function -- pretty self explanatory	2011-09-23 16:11:10 -07:00
Sergey Tsalkov	164c7157a6	queryRaw() will now be officially supported, returns mysqli_result instead of array of assoc arrays	2011-09-23 15:57:36 -07:00
Sergey Tsalkov	f09308a3f7	re-organize test files, make it easy to test for both php 5.2 and 5.3	2011-09-23 15:51:35 -07:00
Sergey Tsalkov	69bfe15ebb	add test case regarding BLOBs	2011-08-25 23:54:52 -07:00
Sergey Tsalkov	7621b50a02	handle non-sql errors (such as failure to connect to MySQL server) in a user-defined way adds DB::$nonsql_error_handler and DB::$throw_exception_on_nonsql_error	2011-08-25 23:34:37 -07:00
Sergey Tsalkov	4122fe52c1	collapse some redundant code into a function	2011-06-02 18:57:46 -04:00
Sergey Tsalkov	8072f6ab07	use static class variable, not static function variable, to hold mysql connection	2011-06-01 17:30:28 -04:00
Sergey Tsalkov	860da8d18a	insert(), replace(), and update() now handle the value NULL correctly	2011-05-31 21:50:24 -04:00
Sergey Tsalkov	0ed2837f3d	on second thought, we won't have insertMany() and replaceMany(), but insert() and replace() will figure out which one you mean this means that a minor undocumented feature, being able to insert an array and have it automatically serialized, can't exist anymore	2011-04-29 01:48:27 -04:00
Sergey Tsalkov	65cae974c5	remove unused variable	2011-04-28 18:51:53 -04:00
Sergey Tsalkov	96892fa6c2	DB::$param_char can now be used to change the char that needs to appear in front of params (% is the default)	2011-04-28 18:41:13 -04:00
Sergey Tsalkov	ad4889da09	revert last commit -- this is a bad way to do it, and I'll have to come up with something else to let people use strings like %i in their SQL and bypass the parser	2011-04-28 18:14:59 -04:00
Sergey Tsalkov	12604d7854	bugfix: let people have literal %'s in their queries without confusing the parser by using %% instead	2011-04-23 20:31:18 -04:00
Sergey Tsalkov	8c5299c2e2	* add insertMany() and replaceMany() to let you do multiple inserts in one SQL command * error and success handlers can now be set to static and object methods	2011-04-23 00:46:51 -04:00
Sergey Tsalkov	964a36e4c2	sqleval() can now be used with %s, %i, and all that good stuff there is probably no good reason to do this, as things like md5() can be done from PHP, but people keep asking for it, so here it is :)	2011-04-22 23:29:09 -04:00
Sergey Tsalkov	68774532e1	add delete() function -- mostly for completeness with insert(), update(), etc	2011-04-22 23:15:14 -04:00
Sergey Tsalkov	2985815750	* add tests for tableList() and columnList() -- those are now supported functions * remove some unused code, minor cleanup	2011-04-22 23:03:37 -04:00
Sergey Tsalkov	4faebb957c	add DB::sqleval() -- can be used with insert() and update() to inject raw sql stuff like NOW()	2011-04-08 13:56:28 -04:00
Sergey Tsalkov	819acb9bff	use fetch_row and not fetch_assoc for queryFirstField and queryFirstColumn -- it should be a bit faster	2011-03-30 13:29:23 -04:00
Sergey Tsalkov	449760eb2a	set the character encoding in the "more proper" way, as recommended by the mysqli manual	2011-03-17 13:14:39 -04:00