Skip to content

Commit

Permalink
new updates.
Browse files Browse the repository at this point in the history
  • Loading branch information
@lilpug
lilpug committed Mar 10, 2017
1 parent f00a5cf commit 80a0605
Show file tree
Hide file tree
Showing 34 changed files with 27 additions and 72 deletions.
0 ...erate files/Microsoft.SqlServer.Types.dll → ...erate files/Microsoft.SqlServer.Types.dll
View file
File renamed without changes.
Binary file renamed .../release/4.0/seperate files/dotnetsdb.dll → ...release/net4/seperate files/dotnetsdb.dll
View file
Binary file not shown.
Binary file renamed .../release/4.0/seperate files/dotnetsdb.pdb → ...release/net4/seperate files/dotnetsdb.pdb
View file
Binary file not shown.
0 .../release/4.0/seperate files/dotnetsdb.xml → ...release/net4/seperate files/dotnetsdb.xml
View file
File renamed without changes.
0 ...release/4.0/seperate files/mysql.data.dll → ...elease/net4/seperate files/mysql.data.dll
View file
File renamed without changes.
Binary file renamed ...led/release/4.0/single file/dotnetsdb.dll → ...ed/release/net4/single file/dotnetsdb.dll
View file
Binary file not shown.
Binary file renamed ...led/release/4.0/single file/dotnetsdb.pdb → ...ed/release/net4/single file/dotnetsdb.pdb
View file
Binary file not shown.
0 ...led/release/4.0/single file/dotnetsdb.xml → ...ed/release/net4/single file/dotnetsdb.xml
View file
File renamed without changes.
0 ...erate files/Microsoft.SqlServer.Types.dll → ...erate files/Microsoft.SqlServer.Types.dll
View file
File renamed without changes.
Binary file renamed .../release/4.5/seperate files/dotnetsdb.dll → ...elease/net45/seperate files/dotnetsdb.dll
View file
Binary file not shown.
Binary file renamed .../release/4.5/seperate files/dotnetsdb.pdb → ...elease/net45/seperate files/dotnetsdb.pdb
View file
Binary file not shown.
0 .../release/4.5/seperate files/dotnetsdb.xml → ...elease/net45/seperate files/dotnetsdb.xml
View file
File renamed without changes.
0 ...release/4.5/seperate files/mysql.data.dll → ...lease/net45/seperate files/mysql.data.dll
View file
File renamed without changes.
Binary file renamed ...led/release/4.5/single file/dotnetsdb.dll → ...d/release/net45/single file/dotnetsdb.dll
View file
Binary file not shown.
Binary file renamed ...led/release/4.5/single file/dotnetsdb.pdb → ...d/release/net45/single file/dotnetsdb.pdb
View file
Binary file not shown.
0 ...led/release/4.5/single file/dotnetsdb.xml → ...d/release/net45/single file/dotnetsdb.xml
View file
File renamed without changes.
0 ...erate files/Microsoft.SqlServer.Types.dll → ...erate files/Microsoft.SqlServer.Types.dll
View file
File renamed without changes.
Binary file renamed .../release/4.6/seperate files/dotnetsdb.dll → ...elease/net46/seperate files/dotnetsdb.dll
View file
Binary file not shown.
Binary file renamed .../release/4.6/seperate files/dotnetsdb.pdb → ...elease/net46/seperate files/dotnetsdb.pdb
View file
Binary file not shown.
0 .../release/4.6/seperate files/dotnetsdb.xml → ...elease/net46/seperate files/dotnetsdb.xml
View file
File renamed without changes.
0 ...release/4.6/seperate files/mysql.data.dll → ...lease/net46/seperate files/mysql.data.dll
View file
File renamed without changes.
Binary file renamed ...led/release/4.6/single file/dotnetsdb.dll → ...d/release/net46/single file/dotnetsdb.dll
View file
Binary file not shown.
Binary file renamed ...led/release/4.6/single file/dotnetsdb.pdb → ...d/release/net46/single file/dotnetsdb.pdb
View file
Binary file not shown.
0 ...led/release/4.6/single file/dotnetsdb.xml → ...d/release/net46/single file/dotnetsdb.xml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions dotnetsdb/dotnetsdb 4.0/Properties/AssemblyInfo.cs
View file
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.4.0")]
[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: AssemblyVersion("1.0.5.0")]
[assembly: AssemblyFileVersion("1.0.5.0")]
8 changes: 4 additions & 4 deletions dotnetsdb/dotnetsdb 4.0/dotnetsdb 4.0.csproj
View file
Expand Up @@ -17,22 +17,22 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\compiled\debug\4.0\</OutputPath>
<OutputPath>..\..\compiled\debug\net4\</OutputPath>
<DefineConstants>
</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>..\..\compiled\debug\4.0\dotnetsdb.xml</DocumentationFile>
<DocumentationFile>..\..\compiled\debug\net4\dotnetsdb.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\compiled\release\4.0\</OutputPath>
<OutputPath>..\..\compiled\release\net4\</OutputPath>
<DefineConstants>
</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>..\..\compiled\release\4.0\dotnetsdb.xml</DocumentationFile>
<DocumentationFile>..\..\compiled\release\net4\dotnetsdb.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions dotnetsdb/dotnetsdb 4.5/Properties/AssemblyInfo.cs
View file
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.4.0")]
[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: AssemblyVersion("1.0.5.0")]
[assembly: AssemblyFileVersion("1.0.5.0")]
8 changes: 4 additions & 4 deletions dotnetsdb/dotnetsdb 4.5/dotnetsdb 4.5.csproj
View file
Expand Up @@ -17,22 +17,22 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\compiled\debug\4.5\</OutputPath>
<OutputPath>..\..\compiled\debug\net45\</OutputPath>
<DefineConstants>
</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>..\..\compiled\debug\4.5\dotnetsdb.xml</DocumentationFile>
<DocumentationFile>..\..\compiled\debug\net45\dotnetsdb.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\compiled\release\4.5\</OutputPath>
<OutputPath>..\..\compiled\release\net45\</OutputPath>
<DefineConstants>
</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>..\..\compiled\release\4.5\dotnetsdb.xml</DocumentationFile>
<DocumentationFile>..\..\compiled\release\net45\dotnetsdb.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions dotnetsdb/dotnetsdb 4.6/Properties/AssemblyInfo.cs
View file
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.4.0")]
[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: AssemblyVersion("1.0.5.0")]
[assembly: AssemblyFileVersion("1.0.5.0")]
8 changes: 4 additions & 4 deletions dotnetsdb/dotnetsdb 4.6/dotnetsdb 4.6.csproj
View file
Expand Up @@ -17,22 +17,22 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\compiled\debug\4.6\</OutputPath>
<OutputPath>..\..\compiled\debug\net46\</OutputPath>
<DefineConstants>
</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>..\..\compiled\debug\4.6\dotnetsdb.xml</DocumentationFile>
<DocumentationFile>..\..\compiled\debug\net46\dotnetsdb.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\compiled\release\4.6\</OutputPath>
<OutputPath>..\..\compiled\release\net46\</OutputPath>
<DefineConstants>
</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>..\..\compiled\release\4.6\dotnetsdb.xml</DocumentationFile>
<DocumentationFile>..\..\compiled\release\net46\dotnetsdb.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions files/lib/MySQL/Core/Conversion.cs
View file
Expand Up @@ -53,7 +53,7 @@ protected virtual string ResultToJson(ref MySqlDataReader myReader)
}

//Adds the column information section:
sb.Append(string.Format("],\"columns\": { \"count\": {0}, \"names\": [", myReader.FieldCount));
sb.Append(string.Format("],\"columns\": {{ \"count\": {0}, \"names\": [", myReader.FieldCount));
for (int i = 0; i < myReader.FieldCount; i++)
{
if (i == myReader.FieldCount - 1)
Expand All @@ -66,7 +66,7 @@ protected virtual string ResultToJson(ref MySqlDataReader myReader)
}
}

sb.Append(string.Format("]}, \"result_count\": {0} }", rowCount));
sb.Append(string.Format("]}}, \"result_count\": {0} }}", rowCount));

return sb.ToString();
}
Expand Down
4 changes: 2 additions & 2 deletions files/lib/SQLServer/General/Core/Conversion.cs
View file
Expand Up @@ -51,7 +51,7 @@ protected virtual string ResultToJson(ref SqlDataReader myReader)
}

//Adds the column information section:
sb.Append(string.Format("],\"columns\": { \"count\": {0}, \"names\": [", myReader.FieldCount));
sb.Append(string.Format("],\"columns\": {{ \"count\": {0}, \"names\": [", myReader.FieldCount));
for (int i = 0; i < myReader.FieldCount; i++)
{
if (i == myReader.FieldCount - 1)
Expand All @@ -64,7 +64,7 @@ protected virtual string ResultToJson(ref SqlDataReader myReader)
}
}

sb.Append(string.Format("]}, \"result_count\": {0} }", rowCount));
sb.Append(string.Format("]}}, \"result_count\": {0} }}", rowCount));

return sb.ToString();
}
Expand Down
4 changes: 2 additions & 2 deletions files/lib/SQLServer/General/Core/Execution.cs
View file
Expand Up @@ -639,11 +639,11 @@ public virtual void run_bulk_copy(DataTable sourceData, int batchSize = 500, int
}

//Rebuilds the connection string to adjust the timeout in this instance
int start = connection.IndexOf("Connection Timeout=");
int start = connection.IndexOf("connection timeout=");
int end = connection.IndexOf(";", start);

string sub = connection.Substring(start, (end + 1) - start);
string newConnection = connection.Replace(sub, string.Format("Connection Timeout={0};", timeoutSeconds));
string newConnection = connection.Replace(sub, string.Format("connection timeout={0};", timeoutSeconds));

//Uses the new connection string for the connection
using (myConnection = new SqlConnection(newConnection))
Expand Down
51 changes: 3 additions & 48 deletions files/lib/SQLServer/General/FileTable Extension/tasks/db/Get.cs
View file
Expand Up @@ -404,7 +404,7 @@ public DataTable get_all_files_from_root_dt(string tableName)
}
}

public DataTable get_files_from_folder_dt(string tableName, string folderID)
public DataTable get_all_files_from_folder_dt(string tableName, string folderID)
{
try
{
Expand Down Expand Up @@ -486,53 +486,8 @@ public DataTable get_all_folders_from_root_dt(string tableName)
throw errorHandler.CustomErrorOutput(e);
}
}

public DataTable get_folders_from_folder_dt(string tableName, string folderID)
{
try
{
if (!string.IsNullOrWhiteSpace(folderID))
{
string pathLocator = get_path_locator(tableName, folderID);

connector.db.add_pure_sql(string.Format(@"
SELECT
stream_id
,file_stream
,name
--This is required because api output data does not understand the column types
,CAST(path_locator as varchar(max)) as path_locator
,CAST(parent_path_locator as varchar(max)) as parent_path_locator
,file_type
,cached_file_size
,creation_time
,last_write_time
,last_access_time
,is_directory
,is_offline
,is_hidden
,is_readonly
,is_archive
,is_system
,is_temporary
FROM {0}
", tableName));
connector.db.add_where_normal(tableName, "is_directory", 1);
connector.db.add_where_normal(tableName, "parent_path_locator", pathLocator);
return connector.db.run_return_datatable();
}

return null;
}
catch (Exception e)
{
throw errorHandler.CustomErrorOutput(e);
}
}

public DataTable get_root_folders(string tableName)
public DataTable get_all_root_folders(string tableName)
{
try
{
Expand Down Expand Up @@ -570,7 +525,7 @@ public DataTable get_root_folders(string tableName)
}
}

public DataTable get_folders_from_folder(string tableName, string folderID)
public DataTable get_all_folders_from_folder(string tableName, string folderID)
{
try
{
Expand Down

0 comments on commit 80a0605

Please sign in to comment.