Skip to content

Just some minor fixes #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Just some minor fixes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5337407
warnings was commented out
ArsenShnurkov Jul 25, 2015
71e7d1f
remove BinaryReaderPlay.userprefs from git control
ArsenShnurkov Jul 25, 2015
d98e807
Quick fix of console redirection
ArsenShnurkov Jul 25, 2015
9857b9f
.gitignore improvement
ArsenShnurkov Jul 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ ISQL/bin/Release/
ISQL/obj/Release/ISQL.csproj.FileListAbsolute.txt
SqlDbSharpMacUI/bin
SqlDbSharpMacUI/obj
*.userprefs
packages/*
**/bin/*
**/obj/*
16 changes: 0 additions & 16 deletions BinaryReaderPlay.userprefs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion BinaryReaderPlay/org/rufwork/mooresDb/infrastructure/CommandParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions BinaryReaderPlay/org/rufwork/mooresDb/infrastructure/commands/CreateTableCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ class CreateTableCommand
{
private DatabaseContext _database;
private TableContext _table;
private string _strDbLoc;
//private string _strDbLoc;
private List<byte> _lstByteDataTypeRow = new List<byte>();
private List<byte> _lstByteColNames = new List<byte>();

public CreateTableCommand (DatabaseContext database)
{
_database = database;
_strDbLoc = _database.strDbLoc;
//_strDbLoc = _database.strDbLoc;
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion BinaryReaderPlay/org/rufwork/mooresDb/infrastructure/commands/Processors/WhereProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand Down
15 changes: 14 additions & 1 deletion ISQL/org/rufwork/mooresDb/clients/Isql.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "";
Expand All @@ -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 + @"

Expand Down