Skip to content

Commit c3735cd

Browse files
tomFlidrtomFlidr
committed
release 1.2.8
- config files - added default connection string to connect into Access database
1 parent bc2ea47 commit c3735cd

9 files changed

+31
-15
lines changed

‎Databasic.OleSql.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata minClientVersion="2.6">
44
<id>Databasic.OleSql</id>
5-
<version>1.2.6.0</version>
5+
<version>1.2.8.0</version>
66
<title>Databasic - OLE DB</title>
77
<authors>Tom Flidr</authors>
88
<owners>Tom Flidr</owners>
@@ -17,7 +17,7 @@
1717
<copyright>Copyright © 2017</copyright>
1818
<tags>sql ole oledb database query command select insert update delete pure sql dml tool utility library</tags>
1919
<dependencies>
20-
<dependency id="Databasic.Core" version="1.2.4.0" />
20+
<dependency id="Databasic.Core" version="1.2.8.0" />
2121
</dependencies>
2222
<frameworkAssemblies>
2323
<frameworkAssembly assemblyName="System.Core" />

‎Databasic.OleSql.vbproj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@
4242
<PropertyGroup>
4343
<OptionInfer>On</OptionInfer>
4444
</PropertyGroup>
45+
<PropertyGroup>
46+
<SignAssembly>true</SignAssembly>
47+
</PropertyGroup>
48+
<PropertyGroup>
49+
<AssemblyOriginatorKeyFile>Tom Flidr - .NET.pfx</AssemblyOriginatorKeyFile>
50+
</PropertyGroup>
4551
<ItemGroup>
4652
<Reference Include="System" />
4753
<Reference Include="System.Data" />
@@ -103,6 +109,7 @@
103109
<LastGenOutput>Settings.Designer.vb</LastGenOutput>
104110
</None>
105111
<None Include="packages.config" />
112+
<None Include="Tom Flidr - .NET.pfx" />
106113
<None Include="_CreateNewNuGetPackage\Config.ps1" />
107114
<None Include="_CreateNewNuGetPackage\DoNotModify\CreateNuGetPackage.ps1" />
108115
<None Include="_CreateNewNuGetPackage\DoNotModify\New-NuGetPackage.ps1" />

‎My Project/AssemblyInfo.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ Imports System.Runtime.InteropServices
3434
' by using the '*' as shown below:
3535
' <Assembly: AssemblyVersion("1.0.*")>
3636

37-
<Assembly: AssemblyVersion("1.2.6.0")>
38-
<Assembly: AssemblyFileVersion("1.2.6.0")>
37+
<Assembly: AssemblyVersion("1.2.8.0")>
38+
<Assembly: AssemblyFileVersion("1.2.8.0")>

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Databasic - OLE DB
22

3-
[![Latest Stable Version](https://img.shields.io/badge/Stable-v1.2.6-brightgreen.svg?style=plastic)](https://github.com/databasic-net/databasic-core/releases)
3+
[![Latest Stable Version](https://img.shields.io/badge/Stable-v1.2.8-brightgreen.svg?style=plastic)](https://github.com/databasic-net/databasic-core/releases)
44
[![License](https://img.shields.io/badge/Licence-BSD3-brightgreen.svg?style=plastic)](https://raw.githubusercontent.com/databasic-net/databasic-core/master/LICENCE.md)
55
![.NET Version](https://img.shields.io/badge/.NET->=4.0-brightgreen.svg?style=plastic)
66

‎Statement.vb

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Imports System.ComponentModel
1+
Imports System.ComponentModel
22
Imports System.Data.Common
33
Imports System.Data.OleDb
44

@@ -74,9 +74,13 @@ Public Class Statement
7474
Dim sqlParamValue As Object
7575
For Each prop As PropertyDescriptor In TypeDescriptor.GetProperties(sqlParams)
7676
sqlParamValue = prop.GetValue(sqlParams)
77+
If (sqlParamValue Is Nothing) Then
78+
sqlParamValue = DBNull.Value
79+
Else
80+
sqlParamValue = Me.getPossibleUnderlyingEnumValue(sqlParamValue)
81+
End If
7782
Me._cmd.Parameters.AddWithValue(
78-
prop.Name,
79-
If((sqlParamValue Is Nothing), DBNull.Value, sqlParamValue)
83+
prop.Name, sqlParamValue
8084
)
8185
Next
8286
End If
@@ -86,12 +90,17 @@ Public Class Statement
8690
''' </summary>
8791
''' <param name="sqlParams">Dictionary with named keys as MySQL/MariaDB statement params without any '@' chars in dictionary keys.</param>
8892
Protected Overrides Sub addParamsWithValue(sqlParams As Dictionary(Of String, Object))
93+
Dim sqlParamValue As Object
8994
If (Not sqlParams Is Nothing) Then
9095
For Each pair As KeyValuePair(Of String, Object) In sqlParams
96+
If (pair.Value Is Nothing) Then
97+
sqlParamValue = DBNull.Value
98+
Else
99+
sqlParamValue = Me.getPossibleUnderlyingEnumValue(pair.Value)
100+
End If
91101
Me._cmd.Parameters.AddWithValue(
92-
pair.Key,
93-
If((pair.Value Is Nothing), DBNull.Value, pair.Value)
94-
)
102+
pair.Key, sqlParamValue
103+
)
95104
Next
96105
End If
97106
End Sub

‎content/App.config.install.xdt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<clear xdt:Transform="InsertIfMissing" />
55
<add
66
name="Databasic.Example.OleSql"
7-
connectionString="Provider=Microsoft.Jet.OLEDB.4.0;Data Source=C:\PathToYour\Database.mdb;User Id=admin;Password=1234;"
7+
connectionString="Provider=Microsoft.Jet.OLEDB.4.0;Data Source=C:\PathToYour\Database.mdb;User Id=USER_NAME;Password=PASSWORD;"
88
providerName="System.Data.OleDb"
99
xdt:Transform="InsertIfMissing"
1010
xdt:Locator="Match(name)" />

‎content/App.config.uninstall.xdt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<connectionStrings>
44
<add
55
name="Databasic.Example.OleSql"
6-
connectionString="Provider=Microsoft.Jet.OLEDB.4.0;Data Source=C:\PathToYour\Database.mdb;User Id=admin;Password=1234;"
6+
connectionString="Provider=Microsoft.Jet.OLEDB.4.0;Data Source=C:\PathToYour\Database.mdb;User Id=USER_NAME;Password=PASSWORD;"
77
providerName="System.Data.OleDb"
88
xdt:Transform="Remove"
99
xdt:Locator="Match(name)" />

‎content/Web.config.install.xdt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<clear xdt:Transform="InsertIfMissing" />
55
<add
66
name="Databasic.Example.OleSql"
7-
connectionString="Provider=Microsoft.Jet.OLEDB.4.0;Data Source=C:\PathToYour\Database.mdb;User Id=admin;Password=1234;"
7+
connectionString="Provider=Microsoft.Jet.OLEDB.4.0;Data Source=C:\PathToYour\Database.mdb;User Id=USER_NAME;Password=PASSWORD;"
88
providerName="System.Data.OleDb"
99
xdt:Transform="InsertIfMissing"
1010
xdt:Locator="Match(name)" />

‎content/Web.config.uninstall.xdt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<connectionStrings>
44
<add
55
name="Databasic.Example.OleSql"
6-
connectionString="Provider=Microsoft.Jet.OLEDB.4.0;Data Source=C:\PathToYour\Database.mdb;User Id=admin;Password=1234;"
6+
connectionString="Provider=Microsoft.Jet.OLEDB.4.0;Data Source=C:\PathToYour\Database.mdb;User Id=USER_NAME;Password=PASSWORD;"
77
providerName="System.Data.OleDb"
88
xdt:Transform="Remove"
99
xdt:Locator="Match(name)" />

0 commit comments

Comments
 (0)