Skip to content

Commit

Permalink
- rename ZoreEntity to ZeroEntity
Browse files Browse the repository at this point in the history
  • Loading branch information
2881099 committed Dec 21, 2023
1 parent bf92f09 commit 8a70974
Show file tree
Hide file tree
Showing 12 changed files with 68 additions and 68 deletions.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

using FreeSql;
using FreeSql.DataAnnotations;
using FreeSql.Extensions.ZoreEntity;
using FreeSql.Extensions.ZeroEntity;
using FreeSql.Internal.Model;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
Expand All @@ -17,7 +17,7 @@
{
var json = JsonConvert.SerializeObject(Helper.GetTestDesc());

var dyctx = new ZoreDbContext(fsql, JsonConvert.DeserializeObject<TableDescriptor[]>(@"
var dyctx = new ZeroDbContext(fsql, JsonConvert.DeserializeObject<TableDescriptor[]>(@"
[
{
""Name"":""User"",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Extensions\FreeSql.Extensions.ZoreEntity\FreeSql.Extensions.ZoreEntity.csproj" />
<ProjectReference Include="..\..\Extensions\FreeSql.Extensions.ZeroEntity\FreeSql.Extensions.ZeroEntity.csproj" />
<ProjectReference Include="..\..\Providers\FreeSql.Provider.Sqlite\FreeSql.Provider.Sqlite.csproj" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</ItemGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
<DocumentationFile>FreeSql.Extensions.ZoreEntity.xml</DocumentationFile>
<DocumentationFile>FreeSql.Extensions.ZeroEntity.xml</DocumentationFile>
<WarningLevel>3</WarningLevel>
</PropertyGroup>

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
using System.Text;
using T = System.Collections.Generic.Dictionary<string, object>;

namespace FreeSql.Extensions.ZoreEntity
namespace FreeSql.Extensions.ZeroEntity
{
partial class ZoreDbContext
partial class ZeroDbContext
{
public class SelectImpl
{
ZoreDbContext _dbcontext;
ZeroDbContext _dbcontext;
IFreeSql _orm => _dbcontext._orm;
List<ZoreTableInfo> _tables => _dbcontext._tables;
List<ZeroTableInfo> _tables => _dbcontext._tables;
int _mainTableIndex = -1;
List<TableAliasInfo> _tableAlias;
ISelect<TestDynamicFilterInfo> _select;
Expand All @@ -33,7 +33,7 @@ public class SelectImpl
bool _includeAll = false;

SelectImpl() { }
internal SelectImpl(ZoreDbContext dbcontext, string tableName)
internal SelectImpl(ZeroDbContext dbcontext, string tableName)
{
_dbcontext = dbcontext;
var tableIndex = _tables.FindIndex(a => a.CsName.ToLower() == tableName?.ToLower());
Expand Down Expand Up @@ -61,7 +61,7 @@ public SelectImpl IncludeAll()
LocalAutoInclude(_tables[_mainTableIndex], "a");
return this;

void LocalAutoInclude(ZoreTableInfo table, string alias, string navPath = "")
void LocalAutoInclude(ZeroTableInfo table, string alias, string navPath = "")
{
if (ignores.ContainsKey(table.CsName)) return;
ignores.Add(table.CsName, true);
Expand Down Expand Up @@ -179,7 +179,7 @@ SelectImpl Join(string joinType, string tableName, params string[] onFields)
class TableAliasInfo
{
public string Alias { get; set; }
public ZoreTableInfo Table { get; set; }
public ZeroTableInfo Table { get; set; }
public string[] NavPath { get; set; }
public List<NativeTuple<string, Action<SelectImpl>>> IncludeMany { get; set; } = new List<NativeTuple<string, Action<SelectImpl>>>();
}
Expand All @@ -200,7 +200,7 @@ string GetMaxAlias()
return alias;
}
}
TableAliasInfo FlagFetchResult(ZoreTableInfo table, string alias, string navPath)
TableAliasInfo FlagFetchResult(ZeroTableInfo table, string alias, string navPath)
{
var tableAlias = _tableAlias.Where(a => a.Alias == alias).FirstOrDefault();
if (tableAlias == null)
Expand Down Expand Up @@ -533,7 +533,7 @@ public SelectImpl ForUpdate(bool nowait = false)
return this;
}

NativeTuple<string, ColumnInfo> ParseField(ZoreTableInfo firstTable, string firstTableAlias, string property)
NativeTuple<string, ColumnInfo> ParseField(ZeroTableInfo firstTable, string firstTableAlias, string property)
{
if (string.IsNullOrEmpty(property)) return null;
var field = property.Split('.').Select(a => a.Trim()).ToArray();
Expand Down
Loading

0 comments on commit 8a70974

Please sign in to comment.