Skip to content

Commit f050dd7

Browse files
committed
SQLWrapper 1.1.8
1 parent c433a43 commit f050dd7

File tree

5 files changed

+17
-5
lines changed

5 files changed

+17
-5
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/Daikoz.SQLWrapper/bin
2+
/Daikoz.SQLWrapper/obj

Daikoz.SQLWrapper/Daikoz.SQLWrapper.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<LangVersion>latest</LangVersion>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
8-
<Version>1.1.7</Version>
8+
<Version>1.1.8</Version>
99
<Authors>DAIKOZ</Authors>
1010
<Company>DAIKOZ</Company>
1111
<Copyright>© 2019 - DAIKOZ - All rights reserved</Copyright>
@@ -24,8 +24,8 @@
2424

2525
Thus, SQL Wrapper can generate SQL call code from any language like C#, Java, Python, Javascript, VB .NET, ADO .NET ...
2626
</Description>
27-
<AssemblyVersion>1.1.7.0</AssemblyVersion>
28-
<FileVersion>1.1.7.0</FileVersion>
27+
<AssemblyVersion>1.1.8.0</AssemblyVersion>
28+
<FileVersion>1.1.8.0</FileVersion>
2929
<PackageLicenseUrl></PackageLicenseUrl>
3030
<BuildOutputTargetFolder>dll</BuildOutputTargetFolder>
3131
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
91.5 KB
Binary file not shown.

Daikoz.SQLWrapper/tools/Template/CSharp/ADO.xslt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,12 @@
8484
<xsl:text> </xsl:text><xsl:value-of select="name"/> = reader[<xsl:value-of select="position()-1" />] == DBNull.Value ? null : (<xsl:apply-templates select="type"/>)reader[<xsl:value-of select="position()-1" />],
8585
</xsl:when>
8686
<xsl:otherwise>
87-
<xsl:text> </xsl:text><xsl:value-of select="name"/> = (<xsl:apply-templates select="type"/>)reader[<xsl:value-of select="position()-1" />],
87+
<xsl:if test="not(type[@custom])">
88+
<xsl:text> </xsl:text><xsl:value-of select="name"/> = (<xsl:apply-templates select="type"/>)reader[<xsl:value-of select="position()-1" />],
89+
</xsl:if>
90+
<xsl:if test="type[@custom]">
91+
<xsl:text> </xsl:text><xsl:value-of select="name"/> = (<xsl:apply-templates select="type"/>)(typeof(<xsl:apply-templates select="type"/>).IsEnum ? Enum.ToObject(typeof(<xsl:apply-templates select="type"/>), reader[<xsl:value-of select="position()-1" />]) : Convert.ChangeType(reader[<xsl:value-of select="position()-1" />], typeof(<xsl:apply-templates select="type"/>), System.Globalization.CultureInfo.InvariantCulture)),
92+
</xsl:if>
8893
</xsl:otherwise>
8994
</xsl:choose>
9095
</xsl:for-each>

Template/CSharp/ADO.xslt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,12 @@
8484
<xsl:text> </xsl:text><xsl:value-of select="name"/> = reader[<xsl:value-of select="position()-1" />] == DBNull.Value ? null : (<xsl:apply-templates select="type"/>)reader[<xsl:value-of select="position()-1" />],
8585
</xsl:when>
8686
<xsl:otherwise>
87-
<xsl:text> </xsl:text><xsl:value-of select="name"/> = (<xsl:apply-templates select="type"/>)reader[<xsl:value-of select="position()-1" />],
87+
<xsl:if test="not(type[@custom])">
88+
<xsl:text> </xsl:text><xsl:value-of select="name"/> = (<xsl:apply-templates select="type"/>)reader[<xsl:value-of select="position()-1" />],
89+
</xsl:if>
90+
<xsl:if test="type[@custom]">
91+
<xsl:text> </xsl:text><xsl:value-of select="name"/> = (<xsl:apply-templates select="type"/>)(typeof(<xsl:apply-templates select="type"/>).IsEnum ? Enum.ToObject(typeof(<xsl:apply-templates select="type"/>), reader[<xsl:value-of select="position()-1" />]) : Convert.ChangeType(reader[<xsl:value-of select="position()-1" />], typeof(<xsl:apply-templates select="type"/>), System.Globalization.CultureInfo.InvariantCulture)),
92+
</xsl:if>
8893
</xsl:otherwise>
8994
</xsl:choose>
9095
</xsl:for-each>

0 commit comments

Comments
 (0)