From 5337407af198c546191f192ee6efc4ac5327b5ac Mon Sep 17 00:00:00 2001 From: ArsenShnurkov Date: Sat, 25 Jul 2015 18:02:00 +0300 Subject: [PATCH 1/4] warnings was commented out --- .../org/rufwork/mooresDb/infrastructure/CommandParser.cs | 2 +- .../mooresDb/infrastructure/commands/CreateTableCommand.cs | 4 ++-- .../infrastructure/commands/Processors/WhereProcessor.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BinaryReaderPlay/org/rufwork/mooresDb/infrastructure/CommandParser.cs b/BinaryReaderPlay/org/rufwork/mooresDb/infrastructure/CommandParser.cs index 839952d..ab74e21 100644 --- a/BinaryReaderPlay/org/rufwork/mooresDb/infrastructure/CommandParser.cs +++ b/BinaryReaderPlay/org/rufwork/mooresDb/infrastructure/CommandParser.cs @@ -22,7 +22,7 @@ public class CommandParser //string strDatabaseLoc = null; private DatabaseContext _database; private bool _logSql = false; - private string _logLoc = string.Empty; + //private string _logLoc = string.Empty; // TODO: So, obviously, make a base ICommand or CommandBase that everything can implement/extend. // ????: What's the advantage of scoping these at object level, anyhow? <<< What he said. For now, lemming it up, boah. diff --git a/BinaryReaderPlay/org/rufwork/mooresDb/infrastructure/commands/CreateTableCommand.cs b/BinaryReaderPlay/org/rufwork/mooresDb/infrastructure/commands/CreateTableCommand.cs index 78ed01f..3997990 100644 --- a/BinaryReaderPlay/org/rufwork/mooresDb/infrastructure/commands/CreateTableCommand.cs +++ b/BinaryReaderPlay/org/rufwork/mooresDb/infrastructure/commands/CreateTableCommand.cs @@ -24,14 +24,14 @@ class CreateTableCommand { private DatabaseContext _database; private TableContext _table; - private string _strDbLoc; + //private string _strDbLoc; private List _lstByteDataTypeRow = new List(); private List _lstByteColNames = new List(); public CreateTableCommand (DatabaseContext database) { _database = database; - _strDbLoc = _database.strDbLoc; + //_strDbLoc = _database.strDbLoc; } /// diff --git a/BinaryReaderPlay/org/rufwork/mooresDb/infrastructure/commands/Processors/WhereProcessor.cs b/BinaryReaderPlay/org/rufwork/mooresDb/infrastructure/commands/Processors/WhereProcessor.cs index 9389e28..ab1334e 100644 --- a/BinaryReaderPlay/org/rufwork/mooresDb/infrastructure/commands/Processors/WhereProcessor.cs +++ b/BinaryReaderPlay/org/rufwork/mooresDb/infrastructure/commands/Processors/WhereProcessor.cs @@ -142,7 +142,7 @@ CommandParts commandParts foreach (Column mCol in table.getColumns()) { Column colToPullValueFrom = null; - string strUpdateValueModifier = string.Empty; + //string strUpdateValueModifier = string.Empty; if (dictLaunderedUpdateVals.ContainsKey(mCol.strColName)) { From 71e7d1f5845984ac40ca722e744e42f390ae01c2 Mon Sep 17 00:00:00 2001 From: ArsenShnurkov Date: Sat, 25 Jul 2015 18:12:32 +0300 Subject: [PATCH 2/4] remove BinaryReaderPlay.userprefs from git control --- .gitignore | 1 + BinaryReaderPlay.userprefs | 16 ---------------- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 BinaryReaderPlay.userprefs diff --git a/.gitignore b/.gitignore index 4f880f9..28e9fd3 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ ISQL/bin/Release/ ISQL/obj/Release/ISQL.csproj.FileListAbsolute.txt SqlDbSharpMacUI/bin SqlDbSharpMacUI/obj +*.userprefs diff --git a/BinaryReaderPlay.userprefs b/BinaryReaderPlay.userprefs deleted file mode 100644 index 3350dd7..0000000 --- a/BinaryReaderPlay.userprefs +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file From d98e807b7461da8befbff565a8e746a480ecbdeb Mon Sep 17 00:00:00 2001 From: ArsenShnurkov Date: Sat, 25 Jul 2015 18:26:06 +0300 Subject: [PATCH 3/4] Quick fix of console redirection --- ISQL/org/rufwork/mooresDb/clients/Isql.cs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/ISQL/org/rufwork/mooresDb/clients/Isql.cs b/ISQL/org/rufwork/mooresDb/clients/Isql.cs index 755beec..72c2336 100644 --- a/ISQL/org/rufwork/mooresDb/clients/Isql.cs +++ b/ISQL/org/rufwork/mooresDb/clients/Isql.cs @@ -19,6 +19,15 @@ namespace org.rufwork.mooresDb.clients { class Isql { + public static bool IsLinux + { + get + { + int p = (int) Environment.OSVersion.Platform; + return (p == 4) || (p == 6) || (p == 128); + } + } + static void Main(string[] args) { string strInput = ""; @@ -38,7 +47,11 @@ static void Main(string[] args) DatabaseContext dbTemp = null; - Console.SetIn(new StreamReader(Console.OpenStandardInput(4096))); + if (!IsLinux) + { + Console.SetIn (new StreamReader (Console.OpenStandardInput (4096))); + } + Console.WriteLine(@"SqlDb# ISQL client. SqlDb# version: " + MainClass.version + @" From 9857b9ffffd13642b8e5c049d1ae38c193fed3bb Mon Sep 17 00:00:00 2001 From: ArsenShnurkov Date: Sat, 25 Jul 2015 19:46:18 +0300 Subject: [PATCH 4/4] .gitignore improvement --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 28e9fd3..001bf51 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,6 @@ ISQL/obj/Release/ISQL.csproj.FileListAbsolute.txt SqlDbSharpMacUI/bin SqlDbSharpMacUI/obj *.userprefs +packages/* +**/bin/* +**/obj/*