From 5aa4eae557d610a7e601bbe70c0f4381eed4118f Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 3 Oct 2011 08:14:30 +0200 Subject: Proofreading changes --- view/driver.cxx | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'view/driver.cxx') diff --git a/view/driver.cxx b/view/driver.cxx index ccd8d2d..bc32513 100644 --- a/view/driver.cxx +++ b/view/driver.cxx @@ -143,7 +143,7 @@ main (int argc, char* argv[]) result r ( db->query (query::last == "Doe")); - // Results of this aggregate query contains only one element. + // Result of this aggregate query contains only one element. // cout << r.begin ()->count << " employees with the Doe last name" << endl << endl; @@ -151,7 +151,7 @@ main (int argc, char* argv[]) t.commit (); } - // Load the employee-employer information for all the employess with the + // Load the employee-employer information for all the employees with the // Doe last name using the employee_employer view. // { @@ -175,7 +175,7 @@ main (int argc, char* argv[]) t.commit (); } - // Calculate average ages of all employees for each employer. + // Calculate min/max employee ages for each employer. // { typedef odb::query query; @@ -198,7 +198,7 @@ main (int argc, char* argv[]) // query::employee::last == "Doe")); // - cout << "Man/max employee ages" << endl; + cout << "Min/max employee ages" << endl; for (result::iterator i (r.begin ()); i != r.end (); ++i) cout << " " << i->employer_name << " " @@ -209,8 +209,8 @@ main (int argc, char* argv[]) t.commit (); } - // Load the country information employees different residence and - // nationality. + // Load the country information for employees with different residence + // and nationality. // { typedef odb::query query; @@ -218,7 +218,8 @@ main (int argc, char* argv[]) transaction t (db->begin ()); - // Note that we use the alias given in the object pragma after query::. + // Note that we use the alias given in the db object pragma after + // query::. // result r (db->query ( query::res_country::name != query::nat_country::name)); @@ -241,9 +242,9 @@ main (int argc, char* argv[]) transaction t (db->begin ()); - // With native views we have to use the native query syntax. + // With native views we have to use the native SQL query syntax. // - result r (db->query ("vacation_days != 0")); + result r (db->query ("vacation_days <> 0")); cout << "Employees with accumulated vacation days" << endl; @@ -255,15 +256,15 @@ main (int argc, char* argv[]) t.commit (); } - // Get the list of employees that have accumulated vacation days, - // this time using the improved employee_vacation2 view. + // Get the list of employees that have accumulated vacation days, this + // time using the improved employee_vacation2 view. // { typedef odb::result result; transaction t (db->begin ()); - result r (db->query ("vacation_days != 0")); + result r (db->query ("vacation_days <> 0")); cout << "Employees with accumulated vacation days (take 2)" << endl; -- cgit v1.1