Eliminates secondary table JOIN-only fields from returned DataTable.

Issue: If there's a SELECT * and the raw name of the column isn't what's used in the JOIN, it'll bust.

So if we have `Table1` with `Field1` with a raw name of `Fie` and we try...
SELECT * FROM Table1 INNER JOIN Table2 ON Table1.Field1 = Table2.Id
... it'll error out. You instead have to use...
SELECT * FROM Table1 INNER JOIN Table2 ON Table1.Fie = Table2.Id
... which is awkward.

I think I can fix that reasonably easily for the main table, but it'll be a little more difficult -- or at least potentially horribly inefficient -- for secondary tables. I think.

Author: ruffin--

BinaryReaderPlay/org/rufwork/mooresDb/infrastructure/commands/Processors/CommandParts.cs

@@ -28,7 +28,7 @@ public class CommandParts
 
         public Column[] acolInSelect;
         public Queue<string> qstrAllColumnNames = new Queue<string>();
-        public List<string> lstrMainTableJoinONLYFields = new List<string>();   // Sir Not Well Named in this Film.
+        public List<string> lstrJoinONLYFields = new List<string>();   // Sir Still Not Paricularly Well Named in this Film.
         public Dictionary<string, string> dictUpdateColVals = new Dictionary<string, string>();
         public Dictionary<string, string> dictFuzzyToColNameMappings = new Dictionary<string, string>();
         public Dictionary<string, string> dictRawNamesToASNames = new Dictionary<string, string>();
@@ -148,13 +148,35 @@ private void _parseSelectStatement(string strSql)
                         // Keep track of the join fields so we can intelligently select but
                         // not display them if they are/aren't in the SELECT.
                         // Let's start with the bullheaded way.
+
+                        // The most natural place to find fields used to join "secondary
+                        // tables" (any table after the first in the FROM list) would
+                        // actually be in _processInnerJoin in SelectCommand, but this is
+                        // already spaghettied enough. So let's dupe some logic and do it
+                        // here.
+                        // TODO: Consider deciphering lists of tables and fields in a 
+                        // refactored CommandParts and removing that from SelectCommand, etc.
                         string strMainTableName = this.strFrom.Substring(4).Trim();
-                        string[] innerKludgeTokenized = this.strInnerJoinKludge.Split();
-                        foreach (string toke in innerKludgeTokenized)
+                        string[] innerKludgeTokenized = this.strInnerJoinKludge.StringToNonWhitespaceTokens2();
+                        Queue<string> qSecondaryTableNames = new Queue<string>();
+
+                        for (int i=0; i<innerKludgeTokenized.Length; i++)
                         {
+                            string toke = innerKludgeTokenized[i];
                             if (toke.ToUpper().StartsWith(strMainTableName.ToUpper()))
                             {
-                                this.lstrMainTableJoinONLYFields.Add(toke.ReplaceCaseInsensitiveFind(strMainTableName + ".", ""));
+                                this.lstrJoinONLYFields.Add(toke.ReplaceCaseInsensitiveFind(strMainTableName + ".", ""));
+                            }
+                            else if (qSecondaryTableNames.Any(s => toke.ToUpper().StartsWith(s.ToUpper() + ".")))   // TODO: this kinda suggests "." can't be in a table or column name either. Don't think we're checking that.
+                            {
+                                this.lstrJoinONLYFields.Add(toke);
+                            }
+
+                            // TODO: This makes JOIN a pretty hard keyword. I think that's safe, though.
+                            // If you want a table named JOIN, it'll have to be in brackets, right?
+                            if (toke.Equals("JOIN", StringComparison.CurrentCultureIgnoreCase))
+                            {
+                                qSecondaryTableNames.Enqueue(innerKludgeTokenized[i + 1]);
                             }
                         }
                     }
@@ -188,24 +210,39 @@ private void _getColumnsToReturn()
                 // returning the DataTable.
                 // NOTE: I'm not taking into account fuzzily matching names, in part
                 // because I'm planning to remove that painful feature.
-                if (lstrCmdTokens.Contains("*"))
-                {
-                    // If we're selecting everything from the main table,
-                    // no additional columns are needed.
-                    this.lstrMainTableJoinONLYFields = new List<string>();
-                }
-                else
+                foreach (string strSelectCols in lstrCmdTokens)
                 {
-                    foreach (string strMainTableCol in lstrCmdTokens.Where(s => !s.Contains(".") && !s.Contains("*")))
+                    if (strSelectCols.Equals("*"))
                     {
-                        if (this.lstrMainTableJoinONLYFields.Contains(strMainTableCol))
+                        if (1 == lstrJoinONLYFields.Count())
+                        {
+                            // If we're selecting * from everything, then there are no 
+                            // join-only fields/columns.
+                            this.lstrJoinONLYFields = new List<string>();
+                        }
+                        else
                         {
-                            this.lstrMainTableJoinONLYFields.Remove(strMainTableCol);
+                            // Else we're selecting everything from the main table.
+                            this.lstrJoinONLYFields.RemoveAll(s => !s.Contains("."));
                         }
                     }
+                    else if (strSelectCols.Contains("*"))
+                    {
+                        // Find what table we're removing jive from, then find all cols
+                        // that start with that prefix.
+                        // TODO: Double check if we every drop requirement to prefix join
+                        // columns with table names, though I don't think we will.
+                        // TODO: This all goes to heck when we alias JOIN table names. Idiot.
+                        string str2ndaryTable = strSelectCols.ReplaceCaseInsensitiveFind(".*", "");
+                        this.lstrJoinONLYFields.RemoveAll(s => s.StartsWith(str2ndaryTable + "."));
+                    }
+                    else if (this.lstrJoinONLYFields.Contains(strSelectCols))
+                    {
+                        this.lstrJoinONLYFields.Remove(strSelectCols);
+                    }
                 }
 
-                foreach (string strJoinColName in this.lstrMainTableJoinONLYFields)
+                foreach (string strJoinColName in this.lstrJoinONLYFields)
                 {
                     lstrCmdTokens.Add(strJoinColName);
                 }

BinaryReaderPlay/org/rufwork/mooresDb/infrastructure/commands/SelectCommand.cs

@@ -104,9 +104,9 @@ public DataTable executeStatement(string strSql)
                     // TODO: There are better ways to do this.
                     // TODO: Figure out if this handles all fuzzy name translations
                     // earlier in the SELECT process.
-                    if (selectParts.lstrMainTableJoinONLYFields.Count() > 0)
+                    if (selectParts.lstrJoinONLYFields.Count() > 0)
                     {
-                        foreach (string colName in selectParts.lstrMainTableJoinONLYFields)
+                        foreach (string colName in selectParts.lstrJoinONLYFields)
                         {
                             dtReturn.Columns.Remove(colName);
                         }

README.md

@@ -11,7 +11,7 @@
     // ======================== EO LICENSE ===============================
 
 
-### VERSION 0.0.4.2: Nothing is guaranteed to work.  NOTHING.  Use at your own risk.
+### VERSION 0.0.4.3: Nothing is guaranteed to work.  NOTHING.  Use at your own risk.
 
 ###Usage
 
@@ -41,9 +41,9 @@ Step 2: Use the code below *at your own risk*.
 ###Mac OS X Notes
 SqlDb# as a library works fine on Xamarin.Mac or MonoMac. 
 
-**The Isql project**, however, does not echo content entered into a `Console.Read` or `.ReadLine()`, so you can't, for example, see what you're typing in as your SQL statement. I've [filed a bug](https://bugzilla.xamarin.com/show_bug.cgi?id=22262) with Xamarin, but it hasn't gotten much attention. That's somewhat understandable; I haven't been able to make a test case simpler than SqlDb#'s Isql project that exhibits this behavior.
+**The Isql project**, when run on OS X, however, does not echo content entered into a `Console.Read` or `.ReadLine()`, so you can't, for example, see what you're typing in as your SQL statement. I've [filed a bug](https://bugzilla.xamarin.com/show_bug.cgi?id=22262) with Xamarin, but it hasn't gotten much attention. That's somewhat understandable; I haven't been able to make a test case simpler than SqlDb#'s Isql project that exhibits this behavior.
 
-To avoid this echo issue when *developing SqlDb#* (not developing *against* or using; again, the library works fine) using MonoMac or Xamarin.Mac, please use the `MacUI` branch (which contains a native UI ISQL client), merge latest from the `master` branch, set `SqlDbSharpMacUI` as your startup project, and use that interface to run queries during development.
+To avoid this echo issue when *developing SqlDb#* (not developing *against* or using; again, the library works fine afaict) using MonoMac or Xamarin.Mac, please use the `MacUI` branch (which contains a native UI ISQL client), merge latest from the `master` branch, set `SqlDbSharpMacUI` as your startup project, and use that interface to run queries during development.
 
 <img src="http://rufwork.com/code/SqlDbSharp/MacIsql.png"><br>