新增PostgreSQL单元测试；改进数据库驱动下载

xcl-net · Mar 23, 2021 · 0ce1471 · 0ce1471
1 parent f40bbe7
commit 0ce1471
Show file tree

Hide file tree

Showing 6 changed files with 323 additions and 8 deletions.
diff --git a/NewLife.Core/Web/Link.cs b/NewLife.Core/Web/Link.cs
@@ -197,6 +197,15 @@ Int32 ParseTime()
 
                 Name = name.Substring(0, p) + name.Substring(p + 1 + 14);
             }
+            else if (ts.StartsWith("20") && ts.Length >= 4 + 2 + 2)
+            {
+                Time = new DateTime(
+                    ts.Substring(0, 4).ToInt(),
+                    ts.Substring(4, 2).ToInt(),
+                    ts.Substring(6, 2).ToInt());
+
+                Name = name.Substring(0, p) + name.Substring(p + 1 + 8);
+            }
 
             return p;
         }

diff --git a/Test/Test.csproj b/Test/Test.csproj
@@ -30,6 +30,9 @@
   <PropertyGroup Condition="'$(TargetFramework)'=='net5.0'">
     <DefineConstants>$(DefineConstants);__CORE__;NET50</DefineConstants>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Data.SQLite.Core" Version="1.0.113.7" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NewLife.Core\NewLife.Core.csproj" />
     <ProjectReference Include="..\XCode\XCode.csproj" />
@@ -45,6 +48,22 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <!--<PackageReference Include="MySql.Data">
+      <Version>8.0.23</Version>
+    </PackageReference>-->
+    <PackageReference Include="Npgsql">
+      <Version>5.0.3</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+    <!--<PackageReference Include="MySql.Data">
+      <Version>8.0.23</Version>
+    </PackageReference>-->
+    <PackageReference Include="Npgsql">
+      <Version>5.0.3</Version>
+    </PackageReference>
+  </ItemGroup>
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
     <Exec Command="del &quot;$(TargetDir)*.xml&quot; /q" />
   </Target>

diff --git a/XUnitTest.XCode/Code/entity_user_normal.cs b/XUnitTest.XCode/Code/entity_user_normal.cs
@@ -259,7 +259,7 @@ public partial class User
         /// <summary>备注</summary>
         [DisplayName("备注")]
         [Description("备注")]
-        [DataObjectField(false, false, true, 200)]
+        [DataObjectField(false, false, true, 500)]
         [BindColumn("Remark", "备注", "")]
         public String Remark { get => _Remark; set { if (OnPropertyChanging("Remark", value)) { _Remark = value; OnPropertyChanged("Remark"); } } }
         #endregion

diff --git a/XUnitTest.XCode/DataAccessLayer/MySqlTests.cs b/XUnitTest.XCode/DataAccessLayer/MySqlTests.cs
@@ -69,7 +69,7 @@ public void DALTest()
             var db = dal.Db;
             var connstr = db.ConnectionString;
             Assert.Equal("sys", db.DatabaseName);
-            Assert.EndsWith(";Port=3306;Database=sys;Uid=data;Pwd=root;CharSet=utf8mb4;Sslmode=none;AllowPublicKeyRetrieval=true", connstr.Replace("Pass@word", "root"));
+            Assert.EndsWith(";Port=3306;Database=sys;Uid=root;Pwd=root;CharSet=utf8mb4;Sslmode=none;AllowPublicKeyRetrieval=true", connstr.Replace("Pass@word", "root"));
 
             var ver = db.ServerVersion;
             Assert.NotEmpty(ver);

diff --git a/XUnitTest.XCode/DataAccessLayer/NegativeTests.cs b/XUnitTest.XCode/DataAccessLayer/NegativeTests.cs
@@ -53,7 +53,7 @@ UPDATEUSER nvarchar(50) NULL COLLATE NOCASE,
 	UPDATEUSERID int NOT NULL DEFAULT 0,
 	UPDATEIP nvarchar(50) NULL COLLATE NOCASE,
 	UPDATETIME datetime NOT NULL DEFAULT '0001-01-01',
-	REMARK nvarchar(200) NULL COLLATE NOCASE
+	REMARK nvarchar(500) NULL COLLATE NOCASE
 )", rs);
         }
 
@@ -96,7 +96,7 @@ UPDATEUSER VARCHAR(50) COMMENT '更新者',
 	UPDATEUSERID INT NOT NULL COMMENT '更新用户',
 	UPDATEIP VARCHAR(50) COMMENT '更新地址',
 	UPDATETIME DATETIME NOT NULL COMMENT '更新时间',
-	REMARK VARCHAR(200) COMMENT '备注',
+	REMARK VARCHAR(500) COMMENT '备注',
 	Primary Key (ID)
 ) DEFAULT CHARSET=utf8mb4;", rs);
         }
@@ -140,7 +140,7 @@ updateuser nvarchar(50) NULL COLLATE NOCASE,
 	updateuserid int NOT NULL DEFAULT 0,
 	updateip nvarchar(50) NULL COLLATE NOCASE,
 	updatetime datetime NOT NULL DEFAULT '0001-01-01',
-	remark nvarchar(200) NULL COLLATE NOCASE
+	remark nvarchar(500) NULL COLLATE NOCASE
 )", rs);
         }
 
@@ -183,7 +183,7 @@ updateuser VARCHAR(50) COMMENT '更新者',
 	updateuserid INT NOT NULL COMMENT '更新用户',
 	updateip VARCHAR(50) COMMENT '更新地址',
 	updatetime DATETIME NOT NULL COMMENT '更新时间',
-	remark VARCHAR(200) COMMENT '备注',
+	remark VARCHAR(500) COMMENT '备注',
 	Primary Key (id)
 ) DEFAULT CHARSET=utf8mb4;", rs);
         }
@@ -227,7 +227,7 @@ update_user nvarchar(50) NULL COLLATE NOCASE,
 	update_user_id int NOT NULL DEFAULT 0,
 	update_ip nvarchar(50) NULL COLLATE NOCASE,
 	update_time datetime NOT NULL DEFAULT '0001-01-01',
-	remark nvarchar(200) NULL COLLATE NOCASE
+	remark nvarchar(500) NULL COLLATE NOCASE
 )", rs);
         }
 
@@ -270,7 +270,7 @@ update_user VARCHAR(50) COMMENT '更新者',
 	update_user_id INT NOT NULL COMMENT '更新用户',
 	update_ip VARCHAR(50) COMMENT '更新地址',
 	update_time DATETIME NOT NULL COMMENT '更新时间',
-	remark VARCHAR(200) COMMENT '备注',
+	remark VARCHAR(500) COMMENT '备注',
 	Primary Key (id)
 ) DEFAULT CHARSET=utf8mb4;", rs);
         }