Skip to content

Commit 12bcec3

Browse files
PamblamPamblam
committed
trigger build - improved code climate
1 parent 3b48ae6 commit 12bcec3

File tree

3 files changed

+25
-17
lines changed

3 files changed

+25
-17
lines changed

‎jSQL.js‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,8 @@ jSQLTable.prototype.initKeys = function(keys, auto_increment){
461461
// Set up keys if key data is provided
462462
var key;
463463
var keyTypes = ["primary", "unique"];
464-
for(var k=0; key=keys[k]; k++){
464+
for(var k=0; k<keys.length; k++){
465+
key=keys[k];
465466
if(!key.hasOwnProperty("column") || (!Array.isArray(key.column) && this.columns.indexOf(key.column) === -1)) return _throw(new jSQL_Error("0010"));
466467
if(Array.isArray(key.column)){
467468
for(var kk=0; kk<key.column.length; kk++){
@@ -506,7 +507,7 @@ jSQLTable.prototype.renameColumn = function(oldname, newname){
506507
for(var n=this.keys.unique.length; n--;){
507508
if(this.keys.unique[n].column === oldname) this.keys.unique[n].column = newname;
508509
if(Array.isArray(this.keys.unique[n].column))
509-
for(var i=this.keys.unique[n].column.length; i--;)
510+
for(i=this.keys.unique[n].column.length; i--;)
510511
if(this.keys.unique[n].column[i] === oldname) this.keys.unique[n].column[i] = newname;
511512
}
512513
// Update colmap
@@ -583,7 +584,7 @@ jSQLTable.prototype.normalizeInsertRowData = function(data){
583584
if(!data.hasOwnProperty(colname)) continue;
584585

585586
// If the data row column doesn't exist in the table..
586-
if(function(l){ while(l--) if(self.columns[l]==colname) return 0; return 1; }(this.columns.length)){
587+
if(function(l){ while(l--) if(self.columns[l]===colname) return 0; return 1; }(this.columns.length)){
587588
// ...and there is already an undefined row title...
588589
if(this.columns.indexOf("u0") > -1){
589590
// ...let the undefined row inherit this title,
@@ -594,7 +595,7 @@ jSQLTable.prototype.normalizeInsertRowData = function(data){
594595
}else this.addColumn(colname);
595596
}
596597

597-
for(var n=0; n<this.columns.length; n++)
598+
for(n=0; n<this.columns.length; n++)
598599
row.push(data[this.columns[n]]);
599600
}else return _throw(new jSQL_Error("0015"));
600601
return row;
@@ -612,7 +613,7 @@ jSQLTable.prototype.insertRow = function(data, ignore){
612613
row[i] = this.auto_inc_seq;
613614
this.auto_inc_seq++;
614615
}
615-
if(row[i] >= this.auto_inc_seq) this.auto_inc_seq = parseInt(row[i])+1;
616+
if(row[i] >= this.auto_inc_seq) this.auto_inc_seq = parseInt(row[i], 10)+1;
616617
}
617618
row[i] = this.normalizeColumnStoreValue(this.columns[i], row[i]);
618619
}
@@ -627,7 +628,8 @@ jSQLTable.prototype.updateKeysOnInsert = function(row, ignore){
627628
if(this.keys.primary.column){
628629
var primary_key_columns = Array.isArray(this.keys.primary.column) ? this.keys.primary.column : [this.keys.primary.column];
629630
var pk_col, pk_vals = [];
630-
for(var pk=0; pk_col=primary_key_columns[pk]; pk++){
631+
for(var pk=0; pk<primary_key_columns.length; pk++){
632+
pk_col=primary_key_columns[pk];
631633
var primary_index = this.colmap[pk_col];
632634
if(null === row[primary_index]){
633635
if(ignore === true) return false;
@@ -644,10 +646,12 @@ jSQLTable.prototype.updateKeysOnInsert = function(row, ignore){
644646
}
645647

646648
// Check the unique keys, There may be multiple and they may be compound
647-
for(var k=0, ukey; ukey=this.keys.unique[k]; k++){
649+
for(var k=0, ukey; k<this.keys.unique.length; k++){
650+
ukey=this.keys.unique[k]
648651
var key_columns = Array.isArray(ukey.column) ? ukey.column : [ukey.column];
649652
var col, vals = [];
650-
for(var uk=0; col=key_columns[uk]; uk++){
653+
for(var uk=0; uk<key_columns.length; uk++){
654+
col=key_columns[uk]
651655
var index = this.colmap[col];
652656
if(null === row[index]){
653657
if(ignore === true) return false;

‎jSQL.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/table/jSQLTable.js‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ jSQLTable.prototype.initKeys = function(keys, auto_increment){
7777
// Set up keys if key data is provided
7878
var key;
7979
var keyTypes = ["primary", "unique"];
80-
for(var k=0; key=keys[k]; k++){
80+
for(var k=0; k<keys.length; k++){
81+
key=keys[k];
8182
if(!key.hasOwnProperty("column") || (!Array.isArray(key.column) && this.columns.indexOf(key.column) === -1)) return _throw(new jSQL_Error("0010"));
8283
if(Array.isArray(key.column)){
8384
for(var kk=0; kk<key.column.length; kk++){
@@ -122,7 +123,7 @@ jSQLTable.prototype.renameColumn = function(oldname, newname){
122123
for(var n=this.keys.unique.length; n--;){
123124
if(this.keys.unique[n].column === oldname) this.keys.unique[n].column = newname;
124125
if(Array.isArray(this.keys.unique[n].column))
125-
for(var i=this.keys.unique[n].column.length; i--;)
126+
for(i=this.keys.unique[n].column.length; i--;)
126127
if(this.keys.unique[n].column[i] === oldname) this.keys.unique[n].column[i] = newname;
127128
}
128129
// Update colmap
@@ -199,7 +200,7 @@ jSQLTable.prototype.normalizeInsertRowData = function(data){
199200
if(!data.hasOwnProperty(colname)) continue;
200201

201202
// If the data row column doesn't exist in the table..
202-
if(function(l){ while(l--) if(self.columns[l]==colname) return 0; return 1; }(this.columns.length)){
203+
if(function(l){ while(l--) if(self.columns[l]===colname) return 0; return 1; }(this.columns.length)){
203204
// ...and there is already an undefined row title...
204205
if(this.columns.indexOf("u0") > -1){
205206
// ...let the undefined row inherit this title,
@@ -210,7 +211,7 @@ jSQLTable.prototype.normalizeInsertRowData = function(data){
210211
}else this.addColumn(colname);
211212
}
212213

213-
for(var n=0; n<this.columns.length; n++)
214+
for(n=0; n<this.columns.length; n++)
214215
row.push(data[this.columns[n]]);
215216
}else return _throw(new jSQL_Error("0015"));
216217
return row;
@@ -228,7 +229,7 @@ jSQLTable.prototype.insertRow = function(data, ignore){
228229
row[i] = this.auto_inc_seq;
229230
this.auto_inc_seq++;
230231
}
231-
if(row[i] >= this.auto_inc_seq) this.auto_inc_seq = parseInt(row[i])+1;
232+
if(row[i] >= this.auto_inc_seq) this.auto_inc_seq = parseInt(row[i], 10)+1;
232233
}
233234
row[i] = this.normalizeColumnStoreValue(this.columns[i], row[i]);
234235
}
@@ -243,7 +244,8 @@ jSQLTable.prototype.updateKeysOnInsert = function(row, ignore){
243244
if(this.keys.primary.column){
244245
var primary_key_columns = Array.isArray(this.keys.primary.column) ? this.keys.primary.column : [this.keys.primary.column];
245246
var pk_col, pk_vals = [];
246-
for(var pk=0; pk_col=primary_key_columns[pk]; pk++){
247+
for(var pk=0; pk<primary_key_columns.length; pk++){
248+
pk_col=primary_key_columns[pk];
247249
var primary_index = this.colmap[pk_col];
248250
if(null === row[primary_index]){
249251
if(ignore === true) return false;
@@ -260,10 +262,12 @@ jSQLTable.prototype.updateKeysOnInsert = function(row, ignore){
260262
}
261263

262264
// Check the unique keys, There may be multiple and they may be compound
263-
for(var k=0, ukey; ukey=this.keys.unique[k]; k++){
265+
for(var k=0, ukey; k<this.keys.unique.length; k++){
266+
ukey=this.keys.unique[k];
264267
var key_columns = Array.isArray(ukey.column) ? ukey.column : [ukey.column];
265268
var col, vals = [];
266-
for(var uk=0; col=key_columns[uk]; uk++){
269+
for(var uk=0; uk<key_columns.length; uk++){
270+
col=key_columns[uk]
267271
var index = this.colmap[col];
268272
if(null === row[index]){
269273
if(ignore === true) return false;

0 commit comments

Comments
 (0)