Navigation Menu

Skip to content

Commit

Permalink
change require order (alphabetical order)
Browse files Browse the repository at this point in the history
  • Loading branch information
XadillaX committed Jan 5, 2016
1 parent c088f3f commit 3b319f7
Show file tree
Hide file tree
Showing 15 changed files with 41 additions and 20 deletions.
3 changes: 2 additions & 1 deletion lib/field.js
Expand Up @@ -6,9 +6,10 @@
*/
"use strict";

var fieldTypes = require("./field_type");
var util = require("util");

var fieldTypes = require("./field_type");

/**
* Toshihiko Field
* @param opt {
Expand Down
6 changes: 3 additions & 3 deletions lib/field_type/index.js
Expand Up @@ -6,12 +6,12 @@
*/
"use strict";

var _String = require("./string");
var _Boolean = require("./boolean");
var Integer = require("./integer");
var _String = require("./string");
var Datetime = require("./datetime");
var Float = require("./float");
var Integer = require("./integer");
var Json = require("./json");
var Datetime = require("./datetime");

module.exports = {
String : _String,
Expand Down
5 changes: 3 additions & 2 deletions lib/model.js
Expand Up @@ -6,11 +6,12 @@
*/
"use strict";

var util = require("util");
var colors = require("colors");

var Field = require("./field");
var Query = require("./query");
var Yukari = require("./yukari");
var util = require("util");
var colors = require("colors");

/**
* Toshihiko Model
Expand Down
12 changes: 7 additions & 5 deletions lib/query.js
Expand Up @@ -6,17 +6,19 @@
*/
"use strict";

var λ = require("lodash");
var colors = require("colors");
var util = require("util");
var Yukari = require("./yukari");
var mysql = require("mysql2");

var async = require("async");
var colors = require("colors");
var mysql = require("mysql2");
var Scarlet = require("scarlet-task");
var λ = require("lodash");

var common = require("../util/common");
var escaper = require("./escaper");
var ResultPromisor = require("./result_promisor");
var common = require("../util/common");
var sqlParser = require("../util/sql_parser");
var Yukari = require("./yukari");

/**
* limit array to limit object
Expand Down
3 changes: 2 additions & 1 deletion lib/result_promisor.js
Expand Up @@ -6,9 +6,10 @@
*/
"use strict";

var damnArguments = require("../util/damn_arguments");
var BlueBird = require("bluebird");

var damnArguments = require("../util/damn_arguments");

/**
* Result Promisor
* @constructor
Expand Down
5 changes: 3 additions & 2 deletions lib/toshihiko.js
Expand Up @@ -6,10 +6,11 @@
*/
"use strict";

var = require("lodash");
var mysql = require("mysql2");
var Model = require("./model");
var = require("lodash");

var common = require("../util/common");
var Model = require("./model");

/**
* Toshihiko Main Object
Expand Down
6 changes: 4 additions & 2 deletions lib/yukari.js
Expand Up @@ -6,10 +6,12 @@
*/
"use strict";

var = require("lodash");
var util = require("util");
var mysql = require("mysql2");

var async = require("async");
var mysql = require("mysql2");
var = require("lodash");

var fieldType = require("./field_type");
var ResultPromisor = require("./result_promisor");

Expand Down
1 change: 1 addition & 0 deletions test/escaper.js
Expand Up @@ -5,6 +5,7 @@
* reserved.
*/
require("should");

var escaper = require("../lib/escaper");

describe("Escaper", function() {
Expand Down
3 changes: 2 additions & 1 deletion test/field.js
Expand Up @@ -4,9 +4,10 @@
* Copyright (c) 2015 Souche.com, all rights
* reserved
*/
var field = require("../lib/field_type");
require("should");

var field = require("../lib/field_type");

describe("Field",function () {
describe("float type", function () {
var float = field.Float;
Expand Down
2 changes: 2 additions & 0 deletions test/issues.js
Expand Up @@ -5,7 +5,9 @@
* reserved
*/
require("should");

var T = require("../");

var toshihiko = new T.Toshihiko("myapp_test", "root", "", {
cache : {
name: "memcached",
Expand Down
6 changes: 4 additions & 2 deletions test/model.js
Expand Up @@ -4,10 +4,12 @@
* Copyright (c) 2015 Souche.com, all rights
* reserved
*/
var should = require("should");
var T = require("../");
var async = require("async");
var should = require("should");
var = require("lodash");

var T = require("../");

var toshihiko = new T.Toshihiko("myapp_test", "root", "", {
cache : {
name: "memcached",
Expand Down
2 changes: 2 additions & 0 deletions test/query.js
Expand Up @@ -5,7 +5,9 @@
* reserved.
*/
require("should");

var T = require("../");

var toshihiko = new T.Toshihiko("test", "root", "", {});

var Model = null;
Expand Down
1 change: 1 addition & 0 deletions test/sql_parser.js
Expand Up @@ -5,6 +5,7 @@
* reserved.
*/
require("should");

var parser = require("../util/sql_parser");

describe("Some SQL Parser", function() {
Expand Down
2 changes: 2 additions & 0 deletions test/toshihiko.js
Expand Up @@ -5,8 +5,10 @@
* reserved.
*/
var should = require("should");

var Toshihiko = require("../lib/toshihiko");
var Type = require("../lib/field_type");

var toshihiko = new Toshihiko("test", "root", "");

describe("toshihiko", function() {
Expand Down
4 changes: 3 additions & 1 deletion test/yukari.js
Expand Up @@ -5,8 +5,10 @@
* reserved.
*/
var should = require("should");
var T = require("../");
var moment = require("moment");

var T = require("../");

var toshihiko = new T.Toshihiko("myapp_test", "root", "", {
cache : {
name: "memcached",
Expand Down

0 comments on commit 3b319f7

Please sign in to comment.