Skip to content

Commit

Permalink
fix: skip connecting if models are synchronized already
Browse files Browse the repository at this point in the history
  • Loading branch information
cyjake committed Oct 18, 2021
1 parent 3325539 commit 7aab6b1
Show file tree
Hide file tree
Showing 6 changed files with 64 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/npmpublish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Node.js Package

on:
release:
types: [created]
types: [published]

jobs:
build:
Expand Down
3 changes: 3 additions & 0 deletions src/bone.js
Original file line number Diff line number Diff line change
Expand Up @@ -1157,6 +1157,9 @@ class Bone {
* @param {boolean} opts.hasMany
*/
static associate(name, opts = {}) {
if (name in this.associations) {
throw new Error(`duplicated association "${name}" on model ${this.name}`);
}
const { className } = opts;
const Model = this.models[className];
if (!Model) throw new Error(`unable to find model "${className}"`);
Expand Down
2 changes: 1 addition & 1 deletion src/realm.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ class Realm {
models = Object.values(this.models);
}

if (models.length > 0) {
if (models.length > 0 && !models.every(model => model.synchronized)) {
await loadModels(this.Bone, models, this.options);
}
this.connected = true;
Expand Down
6 changes: 6 additions & 0 deletions test/integration/suite/associations.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,12 @@ describe('=> Associations', function() {
]);
});

it('Bone.hasOne should throw if association exists', async function() {
assert.throws(function() {
Post.hasOne('attachment'); // exists
}, /duplicated association/);
});

it('Bone.hasOne', async function() {
const post = await Post.first.with('attachment');
expect(post.attachment).to.be.a(Attachment);
Expand Down
25 changes: 25 additions & 0 deletions test/unit/realm.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -860,4 +860,29 @@ describe('=> Realm', () => {
});
});
});

describe('realm.connect', function() {
/**
* If models are cached and connected already, skip connecting them again because it would raise issues like duplicated associations or redundant class property definition etc.
*/
it('should skip connecting if models are synchronized already', async function() {
class User extends Bone {}
const realm = new Realm({
port: process.env.MYSQL_PORT,
user: 'root',
database: 'leoric',
models: [ User ],
});
await realm.connect();
await assert.doesNotReject(async function() {
const realm2 = new Realm({
port: process.env.MYSQL_PORT,
user: 'root',
database: 'leoric',
models: [ User ],
});
await realm2.connect();
});
});
});
});
42 changes: 28 additions & 14 deletions test/unit/spell.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -725,32 +725,46 @@ describe('=> Spell', function() {

describe('silent should work', function() {
it('update', function () {
assert.equal(Post.update({ id: 1 }, { title: 'hello' }, { silent: true }).toString(),
"UPDATE `articles` SET `title` = 'hello' WHERE `id` = 1 AND `gmt_deleted` IS NULL");
assert.equal(
Post.update({ id: 1 }, { title: 'hello' }, { silent: true }).toString(),
"UPDATE `articles` SET `title` = 'hello' WHERE `id` = 1 AND `gmt_deleted` IS NULL"
);
});

it('increment, decrement', function () {
assert.equal(Book.find({ name: 'hello' }).increment('price', 1, { silent: true }).toString(),
"UPDATE `books` SET `price` = `price` + 1 WHERE `name` = 'hello' AND `gmt_deleted` IS NULL");
assert.equal(
Book.find({ name: 'hello' }).increment('price', 1, { silent: true }).toString(),
"UPDATE `books` SET `price` = `price` + 1 WHERE `name` = 'hello' AND `gmt_deleted` IS NULL"
);

assert.equal(Book.find({ name: 'hello' }).decrement('price', 1, { silent: true }).toString(),
"UPDATE `books` SET `price` = `price` - 1 WHERE `name` = 'hello' AND `gmt_deleted` IS NULL");
assert.equal(
Book.find({ name: 'hello' }).decrement('price', 1, { silent: true }).toString(),
"UPDATE `books` SET `price` = `price` - 1 WHERE `name` = 'hello' AND `gmt_deleted` IS NULL"
);

const fakeDate = new Date(`2012-12-14 12:00:00`).getTime();
const clock = sinon.useFakeTimers(fakeDate);
const spell = Book.find({ name: 'hello' });
spell.silent = false;
assert.equal(spell.decrement('price', 1).toString(),
"UPDATE `books` SET `price` = `price` - 1, `gmt_modified` = '2012-12-14 12:00:00.000' WHERE `name` = 'hello' AND `gmt_deleted` IS NULL");
assert.equal(spell.decrement('price', 1, { silent: true }).toString(),
"UPDATE `books` SET `price` = `price` - 1 WHERE `name` = 'hello' AND `gmt_deleted` IS NULL");
assert.equal(
spell.decrement('price', 1).toString(),
"UPDATE `books` SET `price` = `price` - 1, `gmt_modified` = '2012-12-14 12:00:00.000' WHERE `name` = 'hello' AND `gmt_deleted` IS NULL"
);
assert.equal(
spell.decrement('price', 1, { silent: true }).toString(),
"UPDATE `books` SET `price` = `price` - 1 WHERE `name` = 'hello' AND `gmt_deleted` IS NULL"
);

const spell1 = Book.find({ name: 'hello' });
spell1.silent = true;
assert.equal(spell1.decrement('price', 1).toString(),
"UPDATE `books` SET `price` = `price` - 1 WHERE `name` = 'hello' AND `gmt_deleted` IS NULL");
assert.equal(spell1.decrement('price', 1, { silent: false }).toString(),
"UPDATE `books` SET `price` = `price` - 1, `gmt_modified` = '2012-12-14 12:00:00.000' WHERE `name` = 'hello' AND `gmt_deleted` IS NULL");
assert.equal(
spell1.decrement('price', 1).toString(),
"UPDATE `books` SET `price` = `price` - 1 WHERE `name` = 'hello' AND `gmt_deleted` IS NULL"
);
assert.equal(
spell1.decrement('price', 1, { silent: false }).toString(),
"UPDATE `books` SET `price` = `price` - 1, `gmt_modified` = '2012-12-14 12:00:00.000' WHERE `name` = 'hello' AND `gmt_deleted` IS NULL"
);
clock.restore();
});
});
Expand Down

0 comments on commit 7aab6b1

Please sign in to comment.