Browse Source

Merge pull request #84 from yc662/jshintFixup

Address jsHint complaints
dev
Brian C 12 years ago
parent
commit
0ed174e3ac
  1. 6
      lib/joiner.js
  2. 2
      lib/node/unary.js
  3. 2
      test/binary-clause-tests.js
  4. 2
      test/clause-definition.js
  5. 5
      test/column-tests.js
  6. 4
      test/dialects/alter-table-tests.js
  7. 1
      test/dialects/support.js
  8. 1
      test/index-tests.js
  9. 1
      test/select-tests.js
  10. 3
      test/table-tests.js

6
lib/joiner.js

@ -3,7 +3,7 @@ var getPrimaryKeyColumn = function(table) {
var col = table.columns[i];
if(col.primaryKey) {
return col;
}
}
}
};
@ -16,7 +16,7 @@ var findReference = function(left, right) {
if(col.references == leftName || col.references.table == leftName) {
var leftCol = left[col.references.column] || getPrimaryKeyColumn(left);
return {
left: leftCol,
left: leftCol,
right: col
};
}
@ -36,4 +36,4 @@ module.exports = {
}
return left.join(right).on(ref.left.equals(ref.right));
}
}
};

2
lib/node/unary.js

@ -5,7 +5,7 @@ module.exports = Node.define({
type: 'UNARY',
constructor: function(config) {
Node.call(this);
this.left = config.left,
this.left = config.left;
this.operator = config.operator;
}
});

2
test/binary-clause-tests.js

@ -1,4 +1,6 @@
/* global test */
'use strict';
var assert = require('assert');
var Table = require(__dirname + '/../lib/table');

2
test/clause-definition.js

@ -1,4 +1,6 @@
/* global test */
'use strict';
var assert = require('assert');
var Node = require(__dirname + '/../lib/node/');

5
test/column-tests.js

@ -6,7 +6,7 @@ describe('column', function() {
name: 'user',
columns: ['id', 'created']
});
it('can be accessed by property and array', function() {
assert.equal(table.created, table.columns[1], 'should be able to access created both by array and property');
});
@ -26,8 +26,7 @@ describe('column', function() {
describe('in subquery with min', function() {
var subquery = table.subQuery('subTable').select(table.id.min().as('subId'));
var col = subquery.subId.toQuery().text
console.log(col)
var col = subquery.subId.toQuery().text;
assert.equal(col, '"subTable"."subId"');
});
});

4
test/dialects/alter-table-tests.js

@ -128,7 +128,7 @@ var UserWithSignature = Table.define({
name: 'Signature',
dataType: "VARCHAR(255) NOT NULL DEFAULT 'Signature'"
}]
})
});
Harness.test({
query: UserWithSignature.alter().renameColumn(UserWithSignature.get('Signature'), 'sig'),
@ -138,4 +138,4 @@ Harness.test({
text : 'Sqlite cannot rename columns',
throws: true
}
})
});

1
test/dialects/support.js

@ -1,3 +1,4 @@
/* global test */
'use strict';
var assert = require('assert');

1
test/index-tests.js

@ -1,3 +1,4 @@
/* global suite, test */
'use strict';
var assert = require('assert');

1
test/select-tests.js

@ -1,3 +1,4 @@
/* global test */
'use strict';
var assert = require('assert');

3
test/table-tests.js

@ -1,3 +1,4 @@
/* global suite, test */
'use strict';
var assert = require('assert');
@ -29,7 +30,7 @@ suite('table', function() {
table.addColumn(col);
assert.equal(table.columns.length, 1);
assert.equal(table.boom, col);
})
});
test('creates query node', function() {
var sel = table.select(table.boom);

Loading…
Cancel
Save