From 38d5580c54f3c55c0a233b5dba89d6580b867bb8 Mon Sep 17 00:00:00 2001 From: 28810 <28810@YEXIANGQIN> Date: Mon, 16 Dec 2019 10:49:35 +0800 Subject: [PATCH] add vb.net tests --- Examples/test_vb/Program.vb | 26 ----------------- Examples/test_vb/test_vb.vbproj | 13 --------- .../BaseEntity 纯净版源码(.Net 4.0).zip | Bin 0 -> 2340 bytes .../FreeSql.Generator.csproj | 2 +- FreeSql.DbContext/FreeSql.DbContext.csproj | 2 +- FreeSql.DbContext/FreeSql.DbContext.xml | 7 ----- FreeSql.Repository/FreeSql.Repository.csproj | 2 +- FreeSql.Tests.VB/FreeSql.Tests.VB.vbproj | 23 +++++++++++++++ FreeSql.Tests.VB/UnitTest1.vb | 23 +++++++++++++++ FreeSql.Tests.VB/g.vb | 18 ++++++++++++ FreeSql.sln | 27 +++++++++--------- FreeSql/FreeSql.csproj | 2 +- 12 files changed, 81 insertions(+), 64 deletions(-) delete mode 100644 Examples/test_vb/Program.vb delete mode 100644 Examples/test_vb/test_vb.vbproj create mode 100644 Extensions/FreeSql.Extensions.BaseEntity/BaseEntity 纯净版源码(.Net 4.0).zip create mode 100644 FreeSql.Tests.VB/FreeSql.Tests.VB.vbproj create mode 100644 FreeSql.Tests.VB/UnitTest1.vb create mode 100644 FreeSql.Tests.VB/g.vb diff --git a/Examples/test_vb/Program.vb b/Examples/test_vb/Program.vb deleted file mode 100644 index d0eb32f3..00000000 --- a/Examples/test_vb/Program.vb +++ /dev/null @@ -1,26 +0,0 @@ -Imports System - -Module Program - Sub Main(args As String()) - Console.WriteLine("Hello World!") - - Dim fsql = New FreeSql.FreeSqlBuilder() _ - .UseConnectionString(FreeSql.DataType.Sqlite, "data source=testvb.db") _ - .UseAutoSyncStructure(True) _ - .UseMonitorCommand(Sub(cmd) Trace.WriteLine(cmd.CommandText)) _ - .Build() - - REM Microsoft.VisualBasic.CompilerServices.Operators.CompareString() - Dim List1 = fsql.Select(Of Testvb).Where(Function(a) a.Id = 100).ToList() - Dim List2 = fsql.Select(Of Testvb).Where(Function(a) a.Title = "xxx").ToList() - Dim List3 = fsql.Select(Of Testvb).Where(Function(a) a.Title <> "xxx").ToList() - - fsql.Dispose() - End Sub -End Module - -Class Testvb - Property Id As Integer - Property Title As String -End Class - diff --git a/Examples/test_vb/test_vb.vbproj b/Examples/test_vb/test_vb.vbproj deleted file mode 100644 index 6c715f78..00000000 --- a/Examples/test_vb/test_vb.vbproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - Exe - test_vb - netcoreapp3.1 - - - - - - - diff --git a/Extensions/FreeSql.Extensions.BaseEntity/BaseEntity 纯净版源码(.Net 4.0).zip b/Extensions/FreeSql.Extensions.BaseEntity/BaseEntity 纯净版源码(.Net 4.0).zip new file mode 100644 index 0000000000000000000000000000000000000000..15569d335e8997e97db1eaafcf78e9924c4056ce GIT binary patch literal 2340 zcmZ`*XEYqz8Xdhen2d2nO|+Y_x8-n$@( z9?^whkSlk+`(ECA>z(hcZ?AKHeEa*e_u4QmB4Q8#03Zk0mZJ2uZa>i(A_4%QGyuT$ z1t?j0AXHpD?LD6h+j!JG>@6P`1${E!k~hKWQ{-Fs!-zpJ5<=x@6AmzsTN{_xiyaV` z0wJ+A+Xp@c!m!63un+}p)MpzX3e=63)|%G^_G4ruQB08mJAQiy#|Hmza$o)^cb>s+uM+RT{PE0z*PQq758RIe4!1~S);HL?Q--sR7zbOh_`m=l-R?k( zeDwQIlFW3wgFy}8#UJ}SYv#fp!ICaGT&blTzR@w=(qh*css^Q)7%kA@bCG%nFdEdh{i<4ql1#vBOhgjWFb4)s>q8t$ zcZ9Mxierm=%bKcCl%=)S^O;Dr*x@i?>)GT8`j%aLlGKzLsog~F;hW|m?_Scr@G!Qo zW6k^*oOkZwgdPs9@r;&`CY*@xl7)p%CnPuK+14rdbMwT=p)N?{j08Sr`SYu;%XEWR z(h54H7ODIOX4k1oCI~1SoYaGFQk*CC1N~m^DC~6DiJ%4IgNG;L6Ug=wqlt*9UE137 z>kihiy|GNao&2s2es2~h9&S%1FW=P-9@K9A_J{GjUSC~IG7F!FP_x9=Rk{x-kIG?! z)XFWd*#O@(I}sF_NL?5uL_WxVv-{VR#}qKkVry6$HV{#ystyikkHZLYf1;As!r8sV}D z#G?9YPjcy1HR2veGy;z;ltt{NVGDd(MCLLXd`zarcZcKJepHpf&$#k3PF>h8DPaE+ zzUsB`!P9!ko5TRXGim_f#(xN3A7S-G&&BDd0Sp?MmX0fc0$WCYxb_%CaX(aqIj)q0 zh&zq^VQBlivms8e(~2Gvdzbrml6?;#sCZ>U^59#;MH+VgeAUvGM*}NfH_1mibRRol zx}LF@aisHpIOv$!jkZHP%B|Vi9u8DvVeMXf#W-z+Y1bBf>ka8fu8WOXRH}_wbt5t$ zf&#OO8MU>?scKLg#wN#DaAyyQMG2Pb79X1yK`ldGF6xmZN@R`cN0@Z`}D7Q)-+ z&-M?sW&|@_=Q+fM_YMZyY+{|;!0R(%osAnWjOm!D1lFIUR!dRP*P3E^Bg zwXde7;~s2GNYv{=4HadUmqSd(kFa1UK#aMtXX&xYE9guZWMRv-UAiJUM$S}wNr2ix z!`5{q|3p|b&d?geuR+TwyGXN;p;;CVC2pp>l+d$owx`I?7N&Sy==xwX!maiExD`Gj zOGzt72}d!{Bwl8@z`$}rkD3-}ge|^&Um&ZZd$Exc`VM=m*g-79^@X7OO%?E%oaB>4 zJwZl;8k5w~6Vay8ja^7lN!ai7E=X1~ma$M^bQ}y(DkjA?6?UuLjRMpOg14Gy{#M@y zT}l6lo7sf;lsgjK>UQ(Ot=q9V^iD1KzztD$<8T(HF}2K7?=GA=kq*5?Tghno6o$5NK)9kEkkqQFYurC7v}cYzotS|Zmg|OG9B2u z9@n0-0WDFBL&(sNRFcam&AWMDVl!^#=IgegdpKdwqeX=VHN}fo;9ta&%VTVnqUWHQ z!HK^a^Jx_=FECgJpm`OXfJLy&UP-frm(>^x-u*I=P7_}D3INk0Ae0CEza(+{+ERWV zj=%bUl)R`f4=?%^=&!$ literal 0 HcmV?d00001 diff --git a/Extensions/FreeSql.Generator/FreeSql.Generator.csproj b/Extensions/FreeSql.Generator/FreeSql.Generator.csproj index 35c6ad32..e057bf5e 100644 --- a/Extensions/FreeSql.Generator/FreeSql.Generator.csproj +++ b/Extensions/FreeSql.Generator/FreeSql.Generator.csproj @@ -9,7 +9,7 @@ 2881099 2881099 FreeSql123 - 使用 FreeSql 快速生成数据库的实体类； dotnet tool install -g FreeSql.Generator + 使用 FreeSql 快速生成数据库的实体类，安装：dotnet tool install -g FreeSql.Generator https://github.com/2881099/FreeSql https://github.com/2881099/FreeSql 0.12.20 diff --git a/FreeSql.DbContext/FreeSql.DbContext.csproj b/FreeSql.DbContext/FreeSql.DbContext.csproj index 6c19ca24..4ebadbdd 100644 --- a/FreeSql.DbContext/FreeSql.DbContext.csproj +++ b/FreeSql.DbContext/FreeSql.DbContext.csproj @@ -5,7 +5,7 @@ 0.12.20 true YeXiangQin - FreeSql is the most convenient ORM in .NetCore, .NetFramework, And Xamarin. It supports Mysql, Postgresql, SqlServer, Oracle, Sqlite, And Odbc. + FreeSql is the ORM in .NetCore, .NetFramework, And Xamarin. It supports Mysql, Postgresql, SqlServer, Oracle, Sqlite, And Odbc. 达梦 https://github.com/2881099/FreeSql.DbContext FreeSql ORM DbContext git diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml index d9f91124..dc0203b8 100644 --- a/FreeSql.DbContext/FreeSql.DbContext.xml +++ b/FreeSql.DbContext/FreeSql.DbContext.xml @@ -110,13 +110,6 @@ 清空状态数据 - - - 根据 lambda 条件删除数据 - - - - 添加 diff --git a/FreeSql.Repository/FreeSql.Repository.csproj b/FreeSql.Repository/FreeSql.Repository.csproj index fa40fd15..f3ed3c0a 100644 --- a/FreeSql.Repository/FreeSql.Repository.csproj +++ b/FreeSql.Repository/FreeSql.Repository.csproj @@ -4,7 +4,7 @@ netstandard2.0;net45;net40 0.12.20 YeXiangQin - FreeSql Implementation of General Repository, Support MySql/SqlServer/PostgreSQL/Oracle/Sqlite, and read/write separation、and split table. + FreeSql Implementation of General Repository, Support MySql/SqlServer/PostgreSQL/Oracle/Sqlite/达梦, and read/write separation、and split table. https://github.com/2881099/FreeSql/wiki/Repository FreeSql ORM Repository true diff --git a/FreeSql.Tests.VB/FreeSql.Tests.VB.vbproj b/FreeSql.Tests.VB/FreeSql.Tests.VB.vbproj new file mode 100644 index 00000000..a8e7b84e --- /dev/null +++ b/FreeSql.Tests.VB/FreeSql.Tests.VB.vbproj @@ -0,0 +1,23 @@ + + + + FreeSql.Tests.VB + netcoreapp3.1 + + false + + + + + + + + + + + + + + + + diff --git a/FreeSql.Tests.VB/UnitTest1.vb b/FreeSql.Tests.VB/UnitTest1.vb new file mode 100644 index 00000000..7c8a5f14 --- /dev/null +++ b/FreeSql.Tests.VB/UnitTest1.vb @@ -0,0 +1,23 @@ +Imports System +Imports Xunit + +Namespace FreeSql.Tests.VB + Public Class UnitTest1 + + Sub TestSub() + + REM VB.net ʽԲ + Dim List1 = g.sqlserver.Select(Of Testvb).Where(Function(a) a.Id = 100).ToList() + Dim List2 = g.sqlserver.Select(Of Testvb).Where(Function(a) a.Title = "xxx").ToList() + Dim List3 = g.sqlserver.Select(Of Testvb).Where(Function(a) a.Title <> "xxx").ToList() + + Dim List4 = g.sqlserver.Select(Of Testvb).ToList(Function(a) New With {a, a.Id, a.Title}) + + End Sub + End Class +End Namespace + +Class Testvb + Property Id As Integer + Property Title As String +End Class diff --git a/FreeSql.Tests.VB/g.vb b/FreeSql.Tests.VB/g.vb new file mode 100644 index 00000000..7a83db79 --- /dev/null +++ b/FreeSql.Tests.VB/g.vb @@ -0,0 +1,18 @@ +Imports System.Threading + +Public Class g + + Shared sqlserverLazy As Lazy(Of IFreeSql) = New Lazy(Of IFreeSql)(New Func(Of IFreeSql)(Function() New FreeSqlBuilder() _ + .UseConnectionString(DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=3") _ + .UseAutoSyncStructure(True) _ + .UseMonitorCommand(Sub(cmd) Trace.WriteLine("\r\n线程" & Thread.CurrentThread.ManagedThreadId & ": " & cmd.CommandText)) _ + .UseLazyLoading(True) _ + .Build())) + + Public Shared ReadOnly Property sqlserver As IFreeSql + Get + Return sqlserverLazy.Value + End Get + End Property + +End Class diff --git a/FreeSql.sln b/FreeSql.sln index 211de198..32083dc2 100644 --- a/FreeSql.sln +++ b/FreeSql.sln @@ -68,7 +68,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "orm_vs_net40", "Examples\or EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Generator", "Extensions\FreeSql.Generator\FreeSql.Generator.csproj", "{6A3A4470-7DF7-411B-AAD7-755D7A9DB5A4}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "test_vb", "Examples\test_vb\test_vb.vbproj", "{0A2206B1-1D34-45F4-B028-E3C5D6F02295}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "FreeSql.Tests.VB", "FreeSql.Tests.VB\FreeSql.Tests.VB.vbproj", "{A4FB811A-15EF-4E4C-AC15-826F9BB44E2D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -404,18 +404,18 @@ Global {6A3A4470-7DF7-411B-AAD7-755D7A9DB5A4}.Release|x64.Build.0 = Release|Any CPU {6A3A4470-7DF7-411B-AAD7-755D7A9DB5A4}.Release|x86.ActiveCfg = Release|Any CPU {6A3A4470-7DF7-411B-AAD7-755D7A9DB5A4}.Release|x86.Build.0 = Release|Any CPU - {0A2206B1-1D34-45F4-B028-E3C5D6F02295}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A2206B1-1D34-45F4-B028-E3C5D6F02295}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A2206B1-1D34-45F4-B028-E3C5D6F02295}.Debug|x64.ActiveCfg = Debug|Any CPU - {0A2206B1-1D34-45F4-B028-E3C5D6F02295}.Debug|x64.Build.0 = Debug|Any CPU - {0A2206B1-1D34-45F4-B028-E3C5D6F02295}.Debug|x86.ActiveCfg = Debug|Any CPU - {0A2206B1-1D34-45F4-B028-E3C5D6F02295}.Debug|x86.Build.0 = Debug|Any CPU - {0A2206B1-1D34-45F4-B028-E3C5D6F02295}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A2206B1-1D34-45F4-B028-E3C5D6F02295}.Release|Any CPU.Build.0 = Release|Any CPU - {0A2206B1-1D34-45F4-B028-E3C5D6F02295}.Release|x64.ActiveCfg = Release|Any CPU - {0A2206B1-1D34-45F4-B028-E3C5D6F02295}.Release|x64.Build.0 = Release|Any CPU - {0A2206B1-1D34-45F4-B028-E3C5D6F02295}.Release|x86.ActiveCfg = Release|Any CPU - {0A2206B1-1D34-45F4-B028-E3C5D6F02295}.Release|x86.Build.0 = Release|Any CPU + {A4FB811A-15EF-4E4C-AC15-826F9BB44E2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A4FB811A-15EF-4E4C-AC15-826F9BB44E2D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A4FB811A-15EF-4E4C-AC15-826F9BB44E2D}.Debug|x64.ActiveCfg = Debug|Any CPU + {A4FB811A-15EF-4E4C-AC15-826F9BB44E2D}.Debug|x64.Build.0 = Debug|Any CPU + {A4FB811A-15EF-4E4C-AC15-826F9BB44E2D}.Debug|x86.ActiveCfg = Debug|Any CPU + {A4FB811A-15EF-4E4C-AC15-826F9BB44E2D}.Debug|x86.Build.0 = Debug|Any CPU + {A4FB811A-15EF-4E4C-AC15-826F9BB44E2D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A4FB811A-15EF-4E4C-AC15-826F9BB44E2D}.Release|Any CPU.Build.0 = Release|Any CPU + {A4FB811A-15EF-4E4C-AC15-826F9BB44E2D}.Release|x64.ActiveCfg = Release|Any CPU + {A4FB811A-15EF-4E4C-AC15-826F9BB44E2D}.Release|x64.Build.0 = Release|Any CPU + {A4FB811A-15EF-4E4C-AC15-826F9BB44E2D}.Release|x86.ActiveCfg = Release|Any CPU + {A4FB811A-15EF-4E4C-AC15-826F9BB44E2D}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -440,7 +440,6 @@ Global {C57444BA-8BF7-4790-A864-7F237123219B} = {2A381C57-2697-427B-9F10-55DA11FD02E4} {1674BCE3-EEB4-4003-A2A7-06F51EFAEA23} = {94C8A78D-AA15-47B2-A348-530CD86BFC1B} {6A3A4470-7DF7-411B-AAD7-755D7A9DB5A4} = {4A92E8A6-9A6D-41A1-9CDA-DE10899648AA} - {0A2206B1-1D34-45F4-B028-E3C5D6F02295} = {94C8A78D-AA15-47B2-A348-530CD86BFC1B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {089687FD-5D25-40AB-BA8A-A10D1E137F98} diff --git a/FreeSql/FreeSql.csproj b/FreeSql/FreeSql.csproj index 100b5b3a..e0441819 100644 --- a/FreeSql/FreeSql.csproj +++ b/FreeSql/FreeSql.csproj @@ -5,7 +5,7 @@ 0.12.20 true YeXiangQin - FreeSql is the most convenient ORM in .NetCore, .NetFramework, And Xamarin. It supports Mysql, Postgresql, SqlServer, Oracle, Sqlite, And Odbc. + FreeSql is the ORM in .NetCore, .NetFramework, And Xamarin. It supports Mysql, Postgresql, SqlServer, Oracle, Sqlite, And Odbc. 达梦 https://github.com/2881099/FreeSql https://github.com/2881099/FreeSql git