Merge branch 'release/1.4.8' into production

CHANGES.md

@@ -0,0 +1,206 @@
+2014-11-27, Version 1.4.8
+=========================
+
+ * fix(initialization): bug fix for setting limit on number of connections in connection pool (cpentra1)
+
+ * Add contribution guidelines (Ryan Graham)
+
+
+2014-09-11, Version 1.4.7
+=========================
+
+ * Enhance error reporting for automigrate/autoupdate (Raymond Feng)
+
+
+2014-09-10, Version 1.4.6
+=========================
+
+ * Bump version (Raymond Feng)
+
+ * Use table name instead of model name (Raymond Feng)
+
+ * Use async and make sure errors are passed to callback (Raymond Feng)
+
+
+2014-08-25, Version 1.4.5
+=========================
+
+ * Bump version (Raymond Feng)
+
+ * Make sure the deferred query will be invoked only once (Raymond Feng)
+
+
+2014-08-20, Version 1.4.4
+=========================
+
+ * Bump version (Raymond Feng)
+
+ * Add ping() (Raymond Feng)
+
+
+2014-08-20, Version 1.4.3
+=========================
+
+ * Bump version (Raymond Feng)
+
+ * Fix MySQL conversion for embedded model instance (Raymond Feng)
+
+ * Fix the createDatabase option (Raymond Feng)
+
+
+2014-08-15, Version 1.4.2
+=========================
+
+ * Bump version (Raymond Feng)
+
+ * Allow properties to pass through mysql driver (Raymond Feng)
+
+ * Fix the default length for strings to avoid row size overflow (Raymond Feng)
+
+
+2014-06-27, Version 1.4.1
+=========================
+
+ * Bump version (Raymond Feng)
+
+ * Fix the test cases as now inq/nin is checked for array values (Raymond Feng)
+
+ * Update link to doc (Rand McKinney)
+
+
+2014-06-23, Version 1.4.0
+=========================
+
+ * Bump version (Raymond Feng)
+
+ * cannot read property of undefined fixed (Johnny Bill)
+
+ * Fix comparison for null and boolean values (Raymond Feng)
+
+ * Map object/json to TEXT (Raymond Feng)
+
+
+2014-06-04, Version 1.3.0
+=========================
+
+ * Remove peer dependency on datasource-juggler (Miroslav Bajtoš)
+
+
+2014-06-02, Version 1.2.3
+=========================
+
+ * Bump version (Raymond Feng)
+
+ * Fix sql injection and add test cases (Raymond Feng)
+
+
+2014-05-29, Version 1.2.2
+=========================
+
+ * Bump version (Raymond Feng)
+
+ * Fix the varchar length (Raymond Feng)
+
+ * Add like/nlike support (Raymond Feng)
+
+ * Fix object/json type mapping (Raymond Feng)
+
+
+2014-05-16, Version 1.2.1
+=========================
+
+ * Bump versions (Raymond Feng)
+
+ * Fix buildWhere (Raymond Feng)
+
+ * Add support for logical operators (AND/OR) (Raymond Feng)
+
+ * updateOrCreate assumes numeric primary key(s) (Scott Anderson)
+
+
+2014-04-08, Version 1.2.0
+=========================
+
+ * Bump version (Raymond Feng)
+
+ * Remove the commented out code (Raymond Feng)
+
+ * Fix the query for discovery with current user (Raymond Feng)
+
+ * Fix the table generation for string ids (Raymond Feng)
+
+ * Update deps (Raymond Feng)
+
+ * Use NULL for undefined (Raymond Feng)
+
+ * Prevent inserting undefined values (Marat Dyatko)
+
+ * Update to dual MIT/StrongLoop license (Raymond Feng)
+
+ * Fix merge issue (Raymond Feng)
+
+ * Reformat code (Raymond Feng)
+
+ * Update discovery.js (Samer Aldefai)
+
+ * Fix link to docs. (Rand McKinney)
+
+ * Replaced most content with link to docs. (Rand McKinney)
+
+ * Move mocha args to test/mocha.opts (Ryan Graham)
+
+ * Make 'npm test' more useful to CI (Ryan Graham)
+
+ * Prevent extra files from going into npm (Ryan Graham)
+
+
+2013-12-06, Version 1.1.1
+=========================
+
+ * Bump version (Raymond Feng)
+
+ * Update deps (Raymond Feng)
+
+ * Add the test for loopback-datasource-juggler PR-48 (Raymond Feng)
+
+ * Fix the orderBy (Raymond Feng)
+
+
+2013-11-27, Version 1.1.0
+=========================
+
+ * Bump version (Raymond Feng)
+
+ * Refactor the runQuery logic into a function (Raymond Feng)
+
+ * Improve the connector based on review feedbacks (Raymond Feng)
+
+ * Allow connectionLmit to be set (Raymond Feng)
+
+ * Use connection pool for MySQL (Raymond Feng)
+
+ * Update docs.json (Rand McKinney)
+
+ * Fix the regression caused by juggler (Raymond Feng)
+
+
+2013-11-20, Version 1.0.2
+=========================
+
+ * Remove blanket (Raymond Feng)
+
+ * Bump version and update deps (Raymond Feng)
+
+ * Append error to the message (Raymond Feng)
+
+ * Add NOTICE and update READE (Raymond Feng)
+
+ * Update README.md (Rand McKinney)
+
+ * Update the internal github dependency (Raymond Feng)
+
+
+2013-10-28, Version 1.0.0
+=========================
+
+ * First release!

CONTRIBUTING.md

@@ -0,0 +1,151 @@
+### Contributing ###
+
+Thank you for your interest in `loopback-connector-mysql`, an open source project
+administered by StrongLoop.
+
+Contributing to `loopback-connector-mysql` is easy. In a few simple steps:
+
+  * Ensure that your effort is aligned with the project's roadmap by
+    talking to the maintainers, especially if you are going to spend a
+    lot of time on it.
+
+  * Make something better or fix a bug.
+
+  * Adhere to code style outlined in the [Google C++ Style Guide][] and
+    [Google Javascript Style Guide][].
+
+  * Sign the [Contributor License Agreement](https://cla.strongloop.com/strongloop/loopback-connector-mysql)
+
+  * Submit a pull request through Github.
+
+
+### Contributor License Agreement ###
+
+```
+  Individual Contributor License Agreement
+
+  By signing this Individual Contributor License Agreement
+  ("Agreement"), and making a Contribution (as defined below) to
+  StrongLoop, Inc. ("StrongLoop"), You (as defined below) accept and
+  agree to the following terms and conditions for Your present and
+  future Contributions submitted to StrongLoop. Except for the license
+  granted in this Agreement to StrongLoop and recipients of software
+  distributed by StrongLoop, You reserve all right, title, and interest
+  in and to Your Contributions.
+
+  1. Definitions
+
+     "You" or "Your" shall mean the copyright owner or the individual
+     authorized by the copyright owner that is entering into this
+     Agreement with StrongLoop.
+
+     "Contribution" shall mean any original work of authorship,
+     including any modifications or additions to an existing work, that
+     is intentionally submitted by You to StrongLoop for inclusion in,
+     or documentation of, any of the products owned or managed by
+     StrongLoop ("Work"). For purposes of this definition, "submitted"
+     means any form of electronic, verbal, or written communication
+     sent to StrongLoop or its representatives, including but not
+     limited to communication or electronic mailing lists, source code
+     control systems, and issue tracking systems that are managed by,
+     or on behalf of, StrongLoop for the purpose of discussing and
+     improving the Work, but excluding communication that is
+     conspicuously marked or otherwise designated in writing by You as
+     "Not a Contribution."
+
+  2. You Grant a Copyright License to StrongLoop
+
+     Subject to the terms and conditions of this Agreement, You hereby
+     grant to StrongLoop and recipients of software distributed by
+     StrongLoop, a perpetual, worldwide, non-exclusive, no-charge,
+     royalty-free, irrevocable copyright license to reproduce, prepare
+     derivative works of, publicly display, publicly perform,
+     sublicense, and distribute Your Contributions and such derivative
+     works under any license and without any restrictions.
+
+  3. You Grant a Patent License to StrongLoop
+
+     Subject to the terms and conditions of this Agreement, You hereby
+     grant to StrongLoop and to recipients of software distributed by
+     StrongLoop a perpetual, worldwide, non-exclusive, no-charge,
+     royalty-free, irrevocable (except as stated in this Section)
+     patent license to make, have made, use, offer to sell, sell,
+     import, and otherwise transfer the Work under any license and
+     without any restrictions. The patent license You grant to
+     StrongLoop under this Section applies only to those patent claims
+     licensable by You that are necessarily infringed by Your
+     Contributions(s) alone or by combination of Your Contributions(s)
+     with the Work to which such Contribution(s) was submitted. If any
+     entity institutes a patent litigation against You or any other
+     entity (including a cross-claim or counterclaim in a lawsuit)
+     alleging that Your Contribution, or the Work to which You have
+     contributed, constitutes direct or contributory patent
+     infringement, any patent licenses granted to that entity under
+     this Agreement for that Contribution or Work shall terminate as
+     of the date such litigation is filed.
+
+  4. You Have the Right to Grant Licenses to StrongLoop
+
+     You represent that You are legally entitled to grant the licenses
+     in this Agreement.
+
+     If Your employer(s) has rights to intellectual property that You
+     create, You represent that You have received permission to make
+     the Contributions on behalf of that employer, that Your employer
+     has waived such rights for Your Contributions, or that Your
+     employer has executed a separate Corporate Contributor License
+     Agreement with StrongLoop.
+
+  5. The Contributions Are Your Original Work
+
+     You represent that each of Your Contributions are Your original
+     works of authorship (see Section 8 (Submissions on Behalf of
+     Others) for submission on behalf of others). You represent that to
+     Your knowledge, no other person claims, or has the right to claim,
+     any right in any intellectual property right related to Your
+     Contributions.
+
+     You also represent that You are not legally obligated, whether by
+     entering into an agreement or otherwise, in any way that conflicts
+     with the terms of this Agreement.
+
+     You represent that Your Contribution submissions include complete
+     details of any third-party license or other restriction (including,
+     but not limited to, related patents and trademarks) of which You
+     are personally aware and which are associated with any part of
+     Your Contributions.
+
+  6. You Don't Have an Obligation to Provide Support for Your Contributions
+
+     You are not expected to provide support for Your Contributions,
+     except to the extent You desire to provide support. You may provide
+     support for free, for a fee, or not at all.
+
+  6. No Warranties or Conditions
+
+     StrongLoop acknowledges that unless required by applicable law or
+     agreed to in writing, You provide Your Contributions on an "AS IS"
+     BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER
+     EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES
+     OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY, OR
+     FITNESS FOR A PARTICULAR PURPOSE.
+
+  7. Submission on Behalf of Others
+
+     If You wish to submit work that is not Your original creation, You
+     may submit it to StrongLoop separately from any Contribution,
+     identifying the complete details of its source and of any license
+     or other restriction (including, but not limited to, related
+     patents, trademarks, and license agreements) of which You are
+     personally aware, and conspicuously marking the work as
+     "Submitted on Behalf of a Third-Party: [named here]".
+
+  8. Agree to Notify of Change of Circumstances
+
+     You agree to notify StrongLoop of any facts or circumstances of
+     which You become aware that would make these representations
+     inaccurate in any respect. Email us at callback@strongloop.com.
+```
+
+[Google C++ Style Guide]: https://google-styleguide.googlecode.com/svn/trunk/cppguide.xml
+[Google Javascript Style Guide]: https://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml

lib/mysql.js

@@ -34,7 +34,7 @@ exports.initialize = function initializeDataSource(dataSource, callback) {
   s.supportBigNumbers = (s.supportBigNumbers || false);
   s.timezone = (s.timezone || 'local');
 
-  if (!isNaN(s.connectionLimit)) {
+  if (isNaN(s.connectionLimit)) {
     s.connectionLimit = 10;
   }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "loopback-connector-mysql",
-  "version": "1.4.7",
+  "version": "1.4.8",
   "description": "MySQL connector for loopback-datasource-juggler",
   "main": "index.js",
   "scripts": {
@@ -25,5 +25,8 @@
   "license": {
     "name": "Dual MIT/StrongLoop",
     "url": "https://github.com/strongloop/loopback-connector-mysql/blob/master/LICENSE"
+  },
+  "optionalDependencies": {
+    "sl-blip": "http://blip.strongloop.com/loopback-connector-mysql@1.4.8"
   }
 }