Skip to content

Commit bbf5b9c

Browse files
committed
release 0.7.5
1 parent 4c35be8 commit bbf5b9c

File tree

6 files changed

+6950
-6930
lines changed

6 files changed

+6950
-6930
lines changed

bookshelf.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Bookshelf.js 0.7.4
1+
// Bookshelf.js 0.7.5
22
// ---------------
33

44
// (c) 2013 Tim Griesser
@@ -15,7 +15,7 @@ var Bookshelf = function() {
1515
// `Model` and `Collection` constructors for use in the current instance.
1616
Bookshelf.initialize = function(knex) {
1717
var bookshelf = {
18-
VERSION: '0.7.4'
18+
VERSION: '0.7.5'
1919
};
2020

2121
var _ = require('lodash');

browser/bookshelf.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.Bookshelf=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(_dereq_,module,exports){
2-
// Bookshelf.js 0.7.4
2+
// Bookshelf.js 0.7.5
33
// ---------------
44

55
// (c) 2013 Tim Griesser
@@ -16,7 +16,7 @@ var Bookshelf = function() {
1616
// `Model` and `Collection` constructors for use in the current instance.
1717
Bookshelf.initialize = function(knex) {
1818
var bookshelf = {
19-
VERSION: '0.7.4'
19+
VERSION: '0.7.5'
2020
};
2121

2222
var _ = _dereq_('lodash');
@@ -691,7 +691,9 @@ function BookshelfCollection() {
691691
}
692692
inherits(BookshelfCollection, CollectionBase);
693693

694-
_.extend(BookshelfCollection.prototype, Errors, {
694+
BookshelfCollection.EmptyError = Errors.EmptyError;
695+
696+
_.extend(BookshelfCollection.prototype, {
695697

696698
// Used to define passthrough relationships - `hasOne`, `hasMany`,
697699
// `belongsTo` or `belongsToMany`, "through" a `Interim` model or collection.
@@ -1011,6 +1013,8 @@ function BookshelfModel() {
10111013
}
10121014
inherits(BookshelfModel, ModelBase);
10131015

1016+
BookshelfModel.NotFoundError = Errors.NotFoundError;
1017+
10141018
_.extend(BookshelfModel.prototype, {
10151019

10161020
// The `hasOne` relation specifies that this table has exactly one of another type of object,

0 commit comments

Comments
 (0)