Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/Runtime/XSharp.SQLRdd/DBMS/SqlServer.prg
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ class SqlDbProviderSqlServer inherit SqlDbProvider
{"ASC(%1%)" ,"ASCII(%1%)"},;
{"TRIM(%1%)" ,"RTRIM(%1%)"},;
{"ALLTRIM(%1%)" ,"TRIM(%1%)"},;
{"LENGTH(%1%)" ,"LEN(%1%)"},;
{"+" ,"+"}}
endif
end lock
Expand Down
2 changes: 1 addition & 1 deletion src/Runtime/XSharp.SQLRdd/RDD/SQLRDD-Private.prg
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ partial class SQLRDD
local dbColumn := self:_Fields[index] as RddFieldInfo
// use the BlankValue() from the RddFieldInfo class. One place to define blanks is enough
var blank := dbColumn:BlankValue()
if blank is string var strBlank
if blank is string var strBlank .and. !_oTd:TrimTrailingSpaces
blank := strBlank:PadRight(dbColumn:Length, ' ')
endif
self:_phantomRow[index] := blank
Expand Down
2 changes: 1 addition & 1 deletion src/Runtime/XSharp.SQLRdd/XSharp.SQLRDD.xsproj
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
<Folder Include="Support" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MacroCompiler\MacroCompiler.csproj">
<ProjectReference Include="..\MacroCompiler\XSharp.MacroCompiler.csproj">
<Name>MacroCompiler (Macrocompiler\MacroCompiler)</Name>
<Project>{eb3f3142-07f7-48ca-b38d-f611c45a9511}</Project>
<Private>True</Private>
Expand Down
19 changes: 7 additions & 12 deletions src/SqlRdd.slnx
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<Solution>
<Configurations>
<BuildType Name="Debug" />
<BuildType Name="Release" />
<ProjectType Name="XSharp" TypeId="aa6c8d78-22ff-423a-9c7c-5f2393824e04" Extension=".xsproj" />
</Configurations>
<Folder Name="/Solution Items/">
Expand Down Expand Up @@ -39,8 +37,6 @@
<File Path="Runtime/XmlDoc.Targets" />
</Folder>
<Folder Name="/TestApps/">
<Project Path="C:/SqlRdd/Beta1/Example/DataConverter/DataConverter.xsproj" Id="3409ef64-bb1a-47db-ab1b-38623cf6a251">
</Project>
<Project Path="Runtime/XSharp.SQLRdd.Tests/XSharp.SQLRdd.Tests.xsproj" Id="a9ad5ca6-2b10-47d0-8b50-f5a8a998979f">
</Project>
<Project Path="Tests/SqlDataexpl/SqlRddDataexpl.xsproj" Id="544d5f4f-1ca0-4cf0-a62a-7b4d6ba97aea">
Expand All @@ -49,14 +45,13 @@
</Project>
</Folder>
<Folder Name="/XsRuntime/">
<Project Path="Runtime/MacroCompiler/MacroCompiler.csproj" Id="eb3f3142-07f7-48ca-b38d-f611c45a9511">
</Project>
<Project Path="Runtime/XSharp.Core/XSharp.Core.xsproj" Id="535dff14-efb7-43f5-a4e1-71c1c4280040" />
<Project Path="Runtime/XSharp.Data/XSharp.Data.xsproj" Id="db9ad987-ebd9-4f0c-8604-608a9028585c" />
<Project Path="Runtime/XSharp.Rdd/XSharp.RDD.xsproj" Id="e83c6c8c-773f-4b01-a597-3d38398a9362" />
<Project Path="Runtime/XSharp.RT.Debugger/XSharp.RT.Debugger.xsproj" Id="770e6ebb-804f-415a-a9ca-e5b0383105f0" />
<Project Path="Runtime/XSharp.RT/XSharp.RT.xsproj" Id="ef8d2bf2-e81a-479a-ba4f-294c4c348b66" />
<Project Path="Runtime/MacroCompiler/XSharp.MacroCompiler.csproj" />
<Project Path="Runtime/XSharp.Core/XSharp.Core.xsproj" Id="535dff14-efb7-43f5-a4e1-71c1c4280040" Type="ab494dce-a11b-4583-851e-d4a86775b3f0" />
<Project Path="Runtime/XSharp.Data/XSharp.Data.xsproj" Id="db9ad987-ebd9-4f0c-8604-608a9028585c" Type="ab494dce-a11b-4583-851e-d4a86775b3f0" />
<Project Path="Runtime/XSharp.Rdd/XSharp.RDD.xsproj" Id="e83c6c8c-773f-4b01-a597-3d38398a9362" Type="ab494dce-a11b-4583-851e-d4a86775b3f0" />
<Project Path="Runtime/XSharp.RT.Debugger/XSharp.RT.Debugger.xsproj" Id="770e6ebb-804f-415a-a9ca-e5b0383105f0" Type="ab494dce-a11b-4583-851e-d4a86775b3f0" />
<Project Path="Runtime/XSharp.RT/XSharp.RT.xsproj" Id="ef8d2bf2-e81a-479a-ba4f-294c4c348b66" Type="ab494dce-a11b-4583-851e-d4a86775b3f0" />
<Project Path="Runtime/XSharp.SQLRdd/XSharp.SQLRDD.xsproj" Id="e83c6c8c-773f-4b01-a597-3d38398a9373" />
<Project Path="Runtime/XSharp.VO/XSharp.VO.xsproj" Id="06099c3d-1697-4eb1-9f53-8a9a50b9eacd" />
<Project Path="Runtime/XSharp.VO/XSharp.VO.xsproj" Id="06099c3d-1697-4eb1-9f53-8a9a50b9eacd" Type="ab494dce-a11b-4583-851e-d4a86775b3f0" />
</Folder>
</Solution>
2 changes: 1 addition & 1 deletion src/Tests/SqlDataexpl/SqlRddDataexpl.xsproj
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
<Folder Include="Resources\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Runtime\MacroCompiler\MacroCompiler.csproj">
<ProjectReference Include="..\..\Runtime\MacroCompiler\XSharp.MacroCompiler.csproj">
<Name>MacroCompiler (Macrocompiler\MacroCompiler)</Name>
<Project>{eb3f3142-07f7-48ca-b38d-f611c45a9511}</Project>
<Private>True</Private>
Expand Down
2 changes: 1 addition & 1 deletion src/Tests/SqlRDDTests/SQLRddTests.xsproj
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Runtime\MacroCompiler\MacroCompiler.csproj">
<ProjectReference Include="..\..\Runtime\MacroCompiler\XSharp.MacroCompiler.csproj">
<Name>MacroCompiler (Macrocompiler\MacroCompiler)</Name>
<Project>{eb3f3142-07f7-48ca-b38d-f611c45a9511}</Project>
<Private>True</Private>
Expand Down