Skip to content

Commit

Permalink
1. optimize the SqlMap.xml reading directory
Browse files Browse the repository at this point in the history 
2. remove Strong type Statement
  • Loading branch information
@Ahoo-Wang
Ahoo-Wang committed Jul 19, 2018
1 parent 5d442fa commit 846b536
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 188 deletions.
120 changes: 0 additions & 120 deletions doc/Schemas/SmartSqlMap.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -751,130 +751,10 @@
<xs:attribute name="ParameterMap" type="xs:string" use="optional" />
</xs:complexType>
</xs:element>
<xs:element name="Insert">
<xs:complexType mixed="true">
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element ref="IsEmpty" />
<xs:element ref="IsEqual" />
<xs:element ref="IsGreaterEqual" />
<xs:element ref="IsGreaterThan" />
<xs:element ref="IsLessEqual" />
<xs:element ref="IsLessThan" />
<xs:element ref="IsNotEmpty" />
<xs:element ref="IsNotEqual" />
<xs:element ref="IsNotNull" />
<xs:element ref="IsNull" />
<xs:element ref="Include" />
<xs:element ref="Switch" />
<xs:element ref="IsTrue" />
<xs:element ref="IsFalse" />
<xs:element ref="IsProperty" />
<xs:element ref="Placeholder" />
<xs:element ref="Dynamic" />
<xs:element ref="Where" />
<xs:element ref="Set" />
<xs:element ref="For" />
<xs:element ref="Env" />
</xs:choice>
<xs:attribute name="Id" type="xs:string" use="required" />
<xs:attribute name="Cache" type="xs:string" use="optional" />
</xs:complexType>
</xs:element>
<xs:element name="Update">
<xs:complexType mixed="true">
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element ref="IsEmpty" />
<xs:element ref="IsEqual" />
<xs:element ref="IsGreaterEqual" />
<xs:element ref="IsGreaterThan" />
<xs:element ref="IsLessEqual" />
<xs:element ref="IsLessThan" />
<xs:element ref="IsNotEmpty" />
<xs:element ref="IsNotEqual" />
<xs:element ref="IsNotNull" />
<xs:element ref="IsNull" />
<xs:element ref="Include" />
<xs:element ref="Switch" />
<xs:element ref="IsTrue" />
<xs:element ref="IsFalse" />
<xs:element ref="IsProperty" />
<xs:element ref="Placeholder" />
<xs:element ref="Dynamic" />
<xs:element ref="Where" />
<xs:element ref="Set" />
<xs:element ref="For" />
<xs:element ref="Env" />
</xs:choice>
<xs:attribute name="Id" type="xs:string" use="required" />
<xs:attribute name="Cache" type="xs:string" use="optional" />
</xs:complexType>
</xs:element>
<xs:element name="Delete">
<xs:complexType mixed="true">
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element ref="IsEmpty" />
<xs:element ref="IsEqual" />
<xs:element ref="IsGreaterEqual" />
<xs:element ref="IsGreaterThan" />
<xs:element ref="IsLessEqual" />
<xs:element ref="IsLessThan" />
<xs:element ref="IsNotEmpty" />
<xs:element ref="IsNotEqual" />
<xs:element ref="IsNotNull" />
<xs:element ref="IsNull" />
<xs:element ref="Include" />
<xs:element ref="Switch" />
<xs:element ref="IsTrue" />
<xs:element ref="IsFalse" />
<xs:element ref="IsProperty" />
<xs:element ref="Placeholder" />
<xs:element ref="Dynamic" />
<xs:element ref="Where" />
<xs:element ref="Set" />
<xs:element ref="For" />
<xs:element ref="Env" />
</xs:choice>
<xs:attribute name="Id" type="xs:string" use="required" />
<xs:attribute name="Cache" type="xs:string" use="optional" />
</xs:complexType>
</xs:element>
<xs:element name="Select">
<xs:complexType mixed="true">
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element ref="IsEmpty" />
<xs:element ref="IsEqual" />
<xs:element ref="IsGreaterEqual" />
<xs:element ref="IsGreaterThan" />
<xs:element ref="IsLessEqual" />
<xs:element ref="IsLessThan" />
<xs:element ref="IsNotEmpty" />
<xs:element ref="IsNotEqual" />
<xs:element ref="IsNotNull" />
<xs:element ref="IsNull" />
<xs:element ref="Include" />
<xs:element ref="Switch" />
<xs:element ref="IsTrue" />
<xs:element ref="IsFalse" />
<xs:element ref="IsProperty" />
<xs:element ref="Placeholder" />
<xs:element ref="Dynamic" />
<xs:element ref="Where" />
<xs:element ref="Set" />
<xs:element ref="For" />
<xs:element ref="Env" />
</xs:choice>
<xs:attribute name="Id" type="xs:string" use="required" />
<xs:attribute name="Cache" type="xs:string" use="optional" />
</xs:complexType>
</xs:element>
<xs:element name="Statements" >
<xs:complexType mixed="true">
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="Statement"/>
<xs:element ref="Insert" />
<xs:element ref="Update" />
<xs:element ref="Delete" />
<xs:element ref="Select" />
</xs:choice>
</xs:complexType>
</xs:element>
Expand Down
12 changes: 0 additions & 12 deletions src/SmartSql/Abstractions/ConfigLoader/ConfigLoader.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,18 +89,6 @@ public SmartSqlMap LoadSmartSqlMap(ConfigStream configStream)
#region Init Statement
var statementNodes = xmlDoc.SelectNodes("//ns:Statement", xmlNsM);
LoadStatementInSqlMap(sqlMap, statementNodes);

var insertNodes = xmlDoc.SelectNodes("//ns:Insert", xmlNsM);
LoadStatementInSqlMap(sqlMap, insertNodes);

var updateNodes = xmlDoc.SelectNodes("//ns:Update", xmlNsM);
LoadStatementInSqlMap(sqlMap, updateNodes);

var deleteNodes = xmlDoc.SelectNodes("//ns:Delete", xmlNsM);
LoadStatementInSqlMap(sqlMap, deleteNodes);

var selectNodes = xmlDoc.SelectNodes("//ns:Select", xmlNsM);
LoadStatementInSqlMap(sqlMap, selectNodes);
#endregion

return sqlMap;
Expand Down
11 changes: 0 additions & 11 deletions src/SmartSql/Configuration/Statements/Delete.cs
View file

This file was deleted.

12 changes: 0 additions & 12 deletions src/SmartSql/Configuration/Statements/Insert.cs
View file

This file was deleted.

11 changes: 0 additions & 11 deletions src/SmartSql/Configuration/Statements/Select.cs
View file

This file was deleted.

15 changes: 7 additions & 8 deletions src/SmartSql/Configuration/Statements/Statement.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,24 @@ namespace SmartSql.Configuration.Statements
{
public enum StatementType
{
Statement,
Insert,
Update,
Delete,
Select
Insert = 1 << 0,
Update = 1 << 1,
Delete = 1 << 2,
Select = 1 << 3
}

public class Statement
{
public virtual StatementType Type { get { return StatementType.Statement; } }
public virtual StatementType Type { get; internal set; }
[XmlIgnore]
public SmartSqlMap SmartSqlMap { get; internal set; }
[XmlAttribute]
public String Id { get; set; }
public String FullSqlId => $"{SmartSqlMap.Scope}.{Id}";
public IList<ITag> SqlTags { get; set; }
public Cache Cache { get; set; }
public ResultMap ResultMap { get; set; }
public ParameterMap ParameterMap { get; set; }
public ResultMap ResultMap { get; set; }
public ParameterMap ParameterMap { get; set; }

public void BuildSql(RequestContext context)
{
Expand Down
11 changes: 0 additions & 11 deletions src/SmartSql/Configuration/Statements/Update.cs
View file

This file was deleted.

3 changes: 2 additions & 1 deletion src/SmartSql/LocalFileConfigLoader.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ public override SmartSqlMapConfig Load()
}
case SmartSqlMapSource.ResourceType.Directory:
{
var childSqlmapSources = Directory.EnumerateFiles(sqlMapSource.Path, "*.xml");
var dicPath = Path.Combine(AppContext.BaseDirectory, sqlMapSource.Path);
var childSqlmapSources = Directory.EnumerateFiles(dicPath, "*.xml");
foreach (var childSqlmapSource in childSqlmapSources)
{
LoadSmartSqlMapAndInConfig(childSqlmapSource);
Expand Down
5 changes: 3 additions & 2 deletions src/SmartSql/SmartSql.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@
<PackageProjectUrl>https://github.com/Ahoo-Wang/SmartSql</PackageProjectUrl>
<RepositoryUrl>https://github.com/Ahoo-Wang/SmartSql</RepositoryUrl>
<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
<Version>3.4.2</Version>
<Version>3.4.3</Version>
<PackageTags>orm sql read-write-separation cache redis dotnet-core cross-platform high-performance distributed-computing zookeeper</PackageTags>
<PackageReleaseNotes>
1. Optimize the resource reading directory
1. Optimize the SqlMap.xml reading directory
2. remove Strong type Statement
</PackageReleaseNotes>
<PackageIconUrl>https://raw.githubusercontent.com/Ahoo-Wang/SmartSql/master/SmartSql.png</PackageIconUrl>
<PackageLicenseUrl>https://raw.githubusercontent.com/Ahoo-Wang/SmartSql/master/LICENSE</PackageLicenseUrl>
Expand Down

0 comments on commit 846b536

Please sign in to comment.