Correct 1 last_queried_column misplaced (was not before first return)

silvakid · silvakid · commit 72142eeae269 · 2015-05-13T11:11:15.000+01:00
Correct identation problems
diff --git a/driver/mysql_resultset.cpp b/driver/mysql_resultset.cpp
@@ -162,8 +162,8 @@ MySQL_ResultSet::checkScrollable() const
 	if (resultset_type == sql::ResultSet::TYPE_FORWARD_ONLY) {
 		throw sql::NonScrollableException("Nonscrollable result set");
 	}
-    // reset last_queried_column
-    last_queried_column = -1;
+	// reset last_queried_column
+	last_queried_column = -1;
 }
 /* }}} */
 
@@ -354,7 +354,7 @@ MySQL_ResultSet::getDouble(const uint32_t columnIndex) const
 		throw sql::InvalidArgumentException("MySQL_ResultSet::getDouble: invalid value of 'columnIndex'");
 	}
 
-    last_queried_column = columnIndex;
+	last_queried_column = columnIndex;
 
 	if (row[columnIndex - 1] == NULL) {
 		was_null = true;
@@ -497,12 +497,13 @@ MySQL_ResultSet::getInt64(const uint32_t columnIndex) const
 		throw sql::InvalidArgumentException("MySQL_ResultSet::getInt64: invalid value of 'columnIndex'");
 	}
 
+	last_queried_column = columnIndex;
+
 	if (row[columnIndex - 1] == NULL) {
 		was_null = true;
 		return 0;
 	}
 
-    last_queried_column = columnIndex;
 
 	CPP_INFO_FMT("%ssigned", (getFieldMeta(columnIndex)->flags & UNSIGNED_FLAG)? "un":"");
 	was_null = false;
@@ -560,12 +561,13 @@ MySQL_ResultSet::getUInt64(const uint32_t columnIndex) const
 		throw sql::InvalidArgumentException("MySQL_ResultSet::getUInt64: invalid value of 'columnIndex'");
 	}
 
+	last_queried_column = columnIndex;
+
 	if (row[columnIndex - 1] == NULL) {
 		was_null = true;
 		return 0;
 	}
 
-    last_queried_column = columnIndex;
 
 	CPP_INFO_FMT("%ssigned", (getFieldMeta(columnIndex)->flags & UNSIGNED_FLAG)? "un":"");
 	was_null = false;
@@ -681,7 +683,7 @@ MySQL_ResultSet::getString(const uint32_t columnIndex) const
 		throw sql::InvalidArgumentException("MySQL_ResultSet::getString: invalid value of 'columnIndex'");
 	}
 
-    last_queried_column = columnIndex;
+	last_queried_column = columnIndex;
 
 	if (row == NULL || row[columnIndex - 1] == NULL) {
 		was_null = true;

Original file line number	Diff line number	Diff line change
`@@ -162,8 +162,8 @@ MySQL_ResultSet::checkScrollable() const`
`162`	`162`	`if (resultset_type == sql::ResultSet::TYPE_FORWARD_ONLY) {`
`163`	`163`	`throw sql::NonScrollableException("Nonscrollable result set");`
`164`	`164`	`}`
`165`		`- // reset last_queried_column`
`166`		`- last_queried_column = -1;`
	`165`	`+ // reset last_queried_column`
	`166`	`+ last_queried_column = -1;`
`167`	`167`	`}`
`168`	`168`	`/* }}} */`
`169`	`169`
`@@ -354,7 +354,7 @@ MySQL_ResultSet::getDouble(const uint32_t columnIndex) const`
`354`	`354`	`throw sql::InvalidArgumentException("MySQL_ResultSet::getDouble: invalid value of 'columnIndex'");`
`355`	`355`	`}`
`356`	`356`
`357`		`- last_queried_column = columnIndex;`
	`357`	`+ last_queried_column = columnIndex;`
`358`	`358`
`359`	`359`	`if (row[columnIndex - 1] == NULL) {`
`360`	`360`	`was_null = true;`
`@@ -497,12 +497,13 @@ MySQL_ResultSet::getInt64(const uint32_t columnIndex) const`
`497`	`497`	`throw sql::InvalidArgumentException("MySQL_ResultSet::getInt64: invalid value of 'columnIndex'");`
`498`	`498`	`}`
`499`	`499`
	`500`	`+ last_queried_column = columnIndex;`
	`501`	`+`
`500`	`502`	`if (row[columnIndex - 1] == NULL) {`
`501`	`503`	`was_null = true;`
`502`	`504`	`return 0;`
`503`	`505`	`}`
`504`	`506`
`505`		`- last_queried_column = columnIndex;`
`506`	`507`
`507`	`508`	`CPP_INFO_FMT("%ssigned", (getFieldMeta(columnIndex)->flags & UNSIGNED_FLAG)? "un":"");`
`508`	`509`	`was_null = false;`
`@@ -560,12 +561,13 @@ MySQL_ResultSet::getUInt64(const uint32_t columnIndex) const`
`560`	`561`	`throw sql::InvalidArgumentException("MySQL_ResultSet::getUInt64: invalid value of 'columnIndex'");`
`561`	`562`	`}`
`562`	`563`
	`564`	`+ last_queried_column = columnIndex;`
	`565`	`+`
`563`	`566`	`if (row[columnIndex - 1] == NULL) {`
`564`	`567`	`was_null = true;`
`565`	`568`	`return 0;`
`566`	`569`	`}`
`567`	`570`
`568`		`- last_queried_column = columnIndex;`
`569`	`571`
`570`	`572`	`CPP_INFO_FMT("%ssigned", (getFieldMeta(columnIndex)->flags & UNSIGNED_FLAG)? "un":"");`
`571`	`573`	`was_null = false;`
`@@ -681,7 +683,7 @@ MySQL_ResultSet::getString(const uint32_t columnIndex) const`
`681`	`683`	`throw sql::InvalidArgumentException("MySQL_ResultSet::getString: invalid value of 'columnIndex'");`
`682`	`684`	`}`
`683`	`685`
`684`		`- last_queried_column = columnIndex;`
	`686`	`+ last_queried_column = columnIndex;`
`685`	`687`
`686`	`688`	`if (row == NULL \|\| row[columnIndex - 1] == NULL) {`
`687`	`689`	`was_null = true;`