From beb4b5af7fb8faec6e83c4ddcaf25223dccca23e Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Mon, 5 Nov 2012 12:48:04 +0000 Subject: [PATCH] Fix 1 for serialization - more problems ahead --- Database/Database-Countries.cs | 4 ++-- Database/Database-PostalCodes.cs | 4 ++-- Database/Database-PostalCodesCities.cs | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Database/Database-Countries.cs b/Database/Database-Countries.cs index dcfdb372..8b1b0b90 100644 --- a/Database/Database-Countries.cs +++ b/Database/Database-Countries.cs @@ -20,7 +20,7 @@ namespace Activizr.Database { int countryId = reader.GetInt32(0); string name = reader.GetString(1); - string code = reader.GetString(2); + string code = reader.GetString(2).ToUpperInvariant(); string culture = reader.GetString(3); int geographyId = reader.GetInt32(4); @@ -39,7 +39,7 @@ namespace Activizr.Database connection.Open(); DbCommand command = - GetDbCommand("SELECT " + countryFieldSequence + " WHERE Code='" + countryCode.Replace("'", "''") + "'", + GetDbCommand("SELECT " + countryFieldSequence + " WHERE Code='" + countryCode.ToUpperInvariant().Replace("'", "''") + "'", connection); using (DbDataReader reader = command.ExecuteReader()) diff --git a/Database/Database-PostalCodes.cs b/Database/Database-PostalCodes.cs index 7cb6304d..b5466780 100644 --- a/Database/Database-PostalCodes.cs +++ b/Database/Database-PostalCodes.cs @@ -14,7 +14,7 @@ namespace Activizr.Database #region Field reading code private const string postalCodeFieldSequence = - " PostalCodes.PostalCode,Cities.CityName,Countries.CountryCode " + + " PostalCodes.PostalCode,Cities.CityName,Countries.Code AS CountryCode " + " FROM PostalCodes " + " JOIN Cities ON (PostalCodes.CityId=Cities.CityId) " + " JOIN Countries ON (PostalCodes.CountryId=Countries.CountryId) "; @@ -42,7 +42,7 @@ namespace Activizr.Database DbCommand command = GetDbCommand( - "SELECT" + postalCodeFieldSequence + "WHERE Countries.CountryCode='" + countryCode.Replace("'", "''") + "';", connection); + "SELECT" + postalCodeFieldSequence + "WHERE Countries.Code='" + countryCode.Replace("'", "''") + "';", connection); using (DbDataReader reader = command.ExecuteReader()) { diff --git a/Database/Database-PostalCodesCities.cs b/Database/Database-PostalCodesCities.cs index a2757dce..9aefcb47 100644 --- a/Database/Database-PostalCodesCities.cs +++ b/Database/Database-PostalCodesCities.cs @@ -207,11 +207,13 @@ namespace Activizr.Database public BasicCity[] GetCitiesByCountry(string countryCode) { + BasicCountry country = GetCountry(countryCode); + using (DbConnection connection = GetMySqlDbConnection()) { connection.Open(); - DbCommand command = GetDbCommand("SELECT " + cityFieldSequence + " WHERE CountryCode='" + countryCode.ToUpperInvariant().Replace("'", "''") + "'", + DbCommand command = GetDbCommand("SELECT " + cityFieldSequence + " WHERE CountryId=" + country.CountryId.ToString(), connection); List result = new List(); using (DbDataReader reader = command.ExecuteReader())