Commit 328d52d7 by Dane Springmeyer

Merge pull request #179 from mscdex/code-improvements

Code improvements
parents 1c93a074 4884859a
...@@ -191,9 +191,6 @@ template <class T> Values::Field* ...@@ -191,9 +191,6 @@ template <class T> Values::Field*
else if (source->IsDate()) { else if (source->IsDate()) {
return new Values::Float(pos, source->NumberValue()); return new Values::Float(pos, source->NumberValue());
} }
else if (source->IsUndefined()) {
return NULL;
}
else { else {
return NULL; return NULL;
} }
...@@ -261,7 +258,7 @@ bool Statement::Bind(const Parameters parameters) { ...@@ -261,7 +258,7 @@ bool Statement::Bind(const Parameters parameters) {
Parameters::const_iterator it = parameters.begin(); Parameters::const_iterator it = parameters.begin();
Parameters::const_iterator end = parameters.end(); Parameters::const_iterator end = parameters.end();
for (; it < end; it++) { for (; it < end; ++it) {
Values::Field* field = *it; Values::Field* field = *it;
if (field != NULL) { if (field != NULL) {
...@@ -545,7 +542,7 @@ void Statement::Work_AfterAll(uv_work_t* req) { ...@@ -545,7 +542,7 @@ void Statement::Work_AfterAll(uv_work_t* req) {
Local<Array> result(Array::New(baton->rows.size())); Local<Array> result(Array::New(baton->rows.size()));
Rows::const_iterator it = baton->rows.begin(); Rows::const_iterator it = baton->rows.begin();
Rows::const_iterator end = baton->rows.end(); Rows::const_iterator end = baton->rows.end();
for (int i = 0; it < end; it++, i++) { for (int i = 0; it < end; ++it, i++) {
result->Set(i, RowToJS(*it)); result->Set(i, RowToJS(*it));
delete *it; delete *it;
} }
...@@ -671,7 +668,7 @@ void Statement::AsyncEach(uv_async_t* handle, int status) { ...@@ -671,7 +668,7 @@ void Statement::AsyncEach(uv_async_t* handle, int status) {
Rows::const_iterator it = rows.begin(); Rows::const_iterator it = rows.begin();
Rows::const_iterator end = rows.end(); Rows::const_iterator end = rows.end();
for (int i = 0; it < end; it++, i++) { for (int i = 0; it < end; ++it, i++) {
argv[1] = RowToJS(*it); argv[1] = RowToJS(*it);
async->retrieved++; async->retrieved++;
TRY_CATCH_CALL(async->stmt->handle_, async->item_cb, 2, argv); TRY_CATCH_CALL(async->stmt->handle_, async->item_cb, 2, argv);
...@@ -745,7 +742,7 @@ Local<Object> Statement::RowToJS(Row* row) { ...@@ -745,7 +742,7 @@ Local<Object> Statement::RowToJS(Row* row) {
Row::const_iterator it = row->begin(); Row::const_iterator it = row->begin();
Row::const_iterator end = row->end(); Row::const_iterator end = row->end();
for (int i = 0; it < end; it++, i++) { for (int i = 0; it < end; ++it, i++) {
Values::Field* field = *it; Values::Field* field = *it;
Local<Value> value; Local<Value> value;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment