[hyena] Sync Mono.Data.Sqlite with Banshee's
- From: Gabriel Burt <gburt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [hyena] Sync Mono.Data.Sqlite with Banshee's
- Date: Wed, 26 May 2010 02:38:18 +0000 (UTC)
commit 3d69b85a3659d40d255f5be9e368c04d185d502c
Author: Gabriel Burt <gabriel burt gmail com>
Date: Tue May 25 19:37:33 2010 -0700
Sync Mono.Data.Sqlite with Banshee's
src/Mono.Data.Sqlite/Mono.Data.Sqlite.csproj | 4 +-
src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLite3.cs | 8 ++--
.../Mono.Data.Sqlite/SQLite3_UTF16.cs | 6 +-
.../Mono.Data.Sqlite/SQLiteBase.cs | 12 ++--
.../Mono.Data.Sqlite/SQLiteCommand.cs | 14 +++---
.../Mono.Data.Sqlite/SQLiteCommandBuilder.cs | 8 ++--
.../Mono.Data.Sqlite/SQLiteConnection.cs | 38 +++++++-------
.../SQLiteConnectionStringBuilder.cs | 8 ++--
.../Mono.Data.Sqlite/SQLiteConvert.cs | 20 ++++----
.../Mono.Data.Sqlite/SQLiteDataAdapter.cs | 6 +-
.../Mono.Data.Sqlite/SQLiteDataReader.cs | 58 ++++++++++----------
.../Mono.Data.Sqlite/SQLiteEnlistment.cs | 6 +-
.../Mono.Data.Sqlite/SQLiteException.cs | 6 +-
.../Mono.Data.Sqlite/SQLiteFactory.cs | 6 +-
.../Mono.Data.Sqlite/SQLiteFunction.cs | 14 +++---
.../Mono.Data.Sqlite/SQLiteFunctionAttribute.cs | 6 +-
.../SQLiteMetaDataCollectionNames.cs | 6 +-
.../Mono.Data.Sqlite/SQLiteParameter.cs | 16 +++---
.../Mono.Data.Sqlite/SQLiteParameterCollection.cs | 6 +-
.../Mono.Data.Sqlite/SQLiteStatement.cs | 12 ++--
.../Mono.Data.Sqlite/SQLiteTransaction.cs | 6 +-
.../Mono.Data.Sqlite/SR.Designer.cs | 24 ++++----
.../Mono.Data.Sqlite/SqliteDataSourceEnumerator.cs | 8 ++--
.../Mono.Data.Sqlite/UnsafeNativeMethods.cs | 12 ++--
24 files changed, 155 insertions(+), 155 deletions(-)
---
diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite.csproj b/src/Mono.Data.Sqlite/Mono.Data.Sqlite.csproj
index 483defb..c4fb8bc 100644
--- a/src/Mono.Data.Sqlite/Mono.Data.Sqlite.csproj
+++ b/src/Mono.Data.Sqlite/Mono.Data.Sqlite.csproj
@@ -13,11 +13,11 @@
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<NoStdLib>False</NoStdLib>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<Optimize>true</Optimize>
<OutputPath>..\..\..\bin</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
<DefineConstants>NET_2_0 MONO_BACKWARD_COMPAT</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -86,4 +86,4 @@
</Properties>
</MonoDevelop>
</ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLite3.cs b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLite3.cs
index 00bd232..2b8ed01 100644
--- a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLite3.cs
+++ b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLite3.cs
@@ -18,10 +18,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
-//
+//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
-//
+//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -34,7 +34,7 @@
/********************************************************
* ADO.NET 2.0 Data Provider for Sqlite Version 3.X
* Written by Robert Simpson (robert blackcastlesoft com)
- *
+ *
* Released to the public domain, use at your own risk!
********************************************************/
#if NET_2_0
@@ -665,7 +665,7 @@ namespace Mono.Data.Sqlite
}
}
- internal override int GetLastInsertRowId ()
+ internal override long GetLastInsertRowId ()
{
return UnsafeNativeMethods.sqlite3_last_insert_rowid (_sql);
}
diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLite3_UTF16.cs b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLite3_UTF16.cs
index d109c96..0babde8 100644
--- a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLite3_UTF16.cs
+++ b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLite3_UTF16.cs
@@ -18,10 +18,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
-//
+//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
-//
+//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -34,7 +34,7 @@
/********************************************************
* ADO.NET 2.0 Data Provider for SQLite Version 3.X
* Written by Robert Simpson (robert blackcastlesoft com)
- *
+ *
* Released to the public domain, use at your own risk!
********************************************************/
#if NET_2_0
diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteBase.cs b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteBase.cs
index 35f7535..a7e3394 100644
--- a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteBase.cs
+++ b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteBase.cs
@@ -18,10 +18,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
-//
+//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
-//
+//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -34,7 +34,7 @@
/********************************************************
* ADO.NET 2.0 Data Provider for SQLite Version 3.X
* Written by Robert Simpson (robert blackcastlesoft com)
- *
+ *
* Released to the public domain, use at your own risk!
********************************************************/
#if NET_2_0
@@ -112,7 +112,7 @@ namespace Mono.Data.Sqlite
/// <param name="stmt">The statement to finalize</param>
internal abstract void FinalizeStatement(SqliteStatement stmt);
/// <summary>
- /// Resets a prepared statement so it can be executed again. If the error returned is SQLITE_SCHEMA,
+ /// Resets a prepared statement so it can be executed again. If the error returned is SQLITE_SCHEMA,
/// transparently attempt to rebuild the SQL statement and throw an error if that was not possible.
/// </summary>
/// <param name="stmt">The statement to reset</param>
@@ -177,8 +177,8 @@ namespace Mono.Data.Sqlite
internal abstract void SetCommitHook(SqliteCommitCallback func);
internal abstract void SetRollbackHook(SqliteRollbackCallback func);
- internal abstract int GetLastInsertRowId ();
-
+ internal abstract long GetLastInsertRowId ();
+
internal abstract object GetValue(SqliteStatement stmt, int index, SqliteType typ);
protected virtual void Dispose(bool bDisposing)
diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteCommand.cs b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteCommand.cs
index f954b74..eb9d039 100644
--- a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteCommand.cs
+++ b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteCommand.cs
@@ -18,10 +18,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
-//
+//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
-//
+//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -34,7 +34,7 @@
/********************************************************
* ADO.NET 2.0 Data Provider for SQLite Version 3.X
* Written by Robert Simpson (robert blackcastlesoft com)
- *
+ *
* Released to the public domain, use at your own risk!
********************************************************/
#if NET_2_0
@@ -109,7 +109,7 @@ namespace Mono.Data.Sqlite
/// Initializes the command with the given command text
/// </summary>
/// <param name="commandText">The SQL command text</param>
- public SqliteCommand(string commandText)
+ public SqliteCommand(string commandText)
: this(commandText, null, null)
{
}
@@ -129,7 +129,7 @@ namespace Mono.Data.Sqlite
/// Initializes the command and associates it with the specified connection.
/// </summary>
/// <param name="connection">The connection to associate with the command</param>
- public SqliteCommand(SqliteConnection connection)
+ public SqliteCommand(SqliteConnection connection)
: this(null, connection, null)
{
}
@@ -234,7 +234,7 @@ namespace Mono.Data.Sqlite
_parameterCollection.MapParameters(stmt);
stmt.BindParameters();
- }
+ }
return stmt;
}
catch (Exception)
@@ -648,7 +648,7 @@ namespace Mono.Data.Sqlite
return new SqliteCommand(this);
}
- public int LastInsertRowID ()
+ public long LastInsertRowID ()
{
return _cnn.LastInsertRowId;
}
diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteCommandBuilder.cs b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteCommandBuilder.cs
index 4a3a18c..0910a2d 100644
--- a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteCommandBuilder.cs
+++ b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteCommandBuilder.cs
@@ -18,10 +18,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
-//
+//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
-//
+//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -34,7 +34,7 @@
/********************************************************
* ADO.NET 2.0 Data Provider for Sqlite Version 3.X
* Written by Robert Simpson (robert blackcastlesoft com)
- *
+ *
* Released to the public domain, use at your own risk!
********************************************************/
#if NET_2_0
@@ -347,7 +347,7 @@ namespace Mono.Data.Sqlite
private bool HasSchemaPrimaryKey(DataTable schema)
{
DataColumn IsKeyColumn = schema.Columns[SchemaTableColumn.IsKey];
-
+
foreach (DataRow schemaRow in schema.Rows)
{
if ((bool)schemaRow[IsKeyColumn] == true)
diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteConnection.cs b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteConnection.cs
index aa9b0ed..968501d 100644
--- a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteConnection.cs
+++ b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteConnection.cs
@@ -18,10 +18,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
-//
+//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
-//
+//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -34,7 +34,7 @@
/********************************************************
* ADO.NET 2.0 Data Provider for Sqlite Version 3.X
* Written by Robert Simpson (robert blackcastlesoft com)
- *
+ *
* Released to the public domain, use at your own risk!
********************************************************/
#if NET_2_0
@@ -141,7 +141,7 @@ namespace Mono.Data.Sqlite
/// Busy command timeout value. Defaults to 30
/// </summary>
internal int _busyTimeout;
-
+
#if !PLATFORM_COMPACTFRAMEWORK
/// <summary>
/// Whether or not the connection is enlisted in a distrubuted transaction
@@ -166,7 +166,7 @@ namespace Mono.Data.Sqlite
/// </summary>
private byte[] _password;
#endif
-
+
internal bool _binaryGuid;
internal long _version;
@@ -347,7 +347,7 @@ namespace Mono.Data.Sqlite
}
/// <summary>
- /// Creates a clone of the connection. All attached databases and user-defined functions are cloned. If the existing connection is open, the cloned connection
+ /// Creates a clone of the connection. All attached databases and user-defined functions are cloned. If the existing connection is open, the cloned connection
/// will also be opened.
/// </summary>
/// <returns></returns>
@@ -421,7 +421,7 @@ namespace Mono.Data.Sqlite
/// </summary>
/// <param name="isolationLevel">Sqlite doesn't support varying isolation levels, so this parameter is ignored.</param>
/// <param name="deferredLock">When TRUE, Sqlite defers obtaining a write lock until a write operation is requested.
- /// When FALSE, a writelock is obtained immediately. The default is TRUE, but in a multi-threaded multi-writer
+ /// When FALSE, a writelock is obtained immediately. The default is TRUE, but in a multi-threaded multi-writer
/// environment, one may instead choose to lock the database immediately to avoid any possible writer deadlock.</param>
/// <returns>Returns a SqliteTransaction object.</returns>
public SqliteTransaction BeginTransaction(System.Data.IsolationLevel isolationLevel, bool deferredLock)
@@ -433,7 +433,7 @@ namespace Mono.Data.Sqlite
/// Creates a new SqliteTransaction if one isn't already active on the connection.
/// </summary>
/// <param name="deferredLock">When TRUE, Sqlite defers obtaining a write lock until a write operation is requested.
- /// When FALSE, a writelock is obtained immediately. The default is TRUE, but in a multi-threaded multi-writer
+ /// When FALSE, a writelock is obtained immediately. The default is TRUE, but in a multi-threaded multi-writer
/// environment, one may instead choose to lock the database immediately to avoid any possible writer deadlock.</param>
/// <returns>Returns a SqliteTransaction object.</returns>
public SqliteTransaction BeginTransaction(bool deferredLock)
@@ -503,7 +503,7 @@ namespace Mono.Data.Sqlite
if (_enlistment != null)
{
// If the connection is enlisted in a transaction scope and the scope is still active,
- // we cannot truly shut down this connection until the scope has completed. Therefore make a
+ // we cannot truly shut down this connection until the scope has completed. Therefore make a
// hidden connection temporarily to hold open the connection until the scope has completed.
SqliteConnection cnn = new SqliteConnection();
cnn._sql = _sql;
@@ -511,7 +511,7 @@ namespace Mono.Data.Sqlite
cnn._enlistment = _enlistment;
cnn._connectionState = _connectionState;
cnn._version = _version;
-
+
cnn._enlistment._transaction._cnn = cnn;
cnn._enlistment._disposeConnection = true;
}
@@ -651,7 +651,7 @@ namespace Mono.Data.Sqlite
#endif
public override string DataSource
{
- get
+ get
{
return _dataSource;
}
@@ -678,13 +678,13 @@ namespace Mono.Data.Sqlite
internal void MapMonoKeyword (string[] arPiece, List<KeyValuePair<string, string>> ls)
{
string keyword, value;
-
+
switch (arPiece[0].ToLower (CultureInfo.InvariantCulture)) {
case "uri":
keyword = "Data Source";
value = MapMonoUriPath (arPiece[1]);
break;
-
+
default:
keyword = arPiece[0];
value = arPiece[1];
@@ -706,7 +706,7 @@ namespace Mono.Data.Sqlite
throw new InvalidOperationException ("Invalid connection string: invalid URI");
}
}
-
+
/// <summary>
/// Parses the connection string into component parts
/// </summary>
@@ -808,7 +808,7 @@ namespace Mono.Data.Sqlite
} catch (Exception) {
// ignore
}
-
+
try
{
bool bUTF16 = (Convert.ToBoolean(FindKey(opts, "UseUTF16Encoding", "False"), CultureInfo.InvariantCulture) == true);
@@ -960,7 +960,7 @@ namespace Mono.Data.Sqlite
{
SetPassword(String.IsNullOrEmpty(databasePassword) ? null : System.Text.UTF8Encoding.UTF8.GetBytes(databasePassword));
}
-
+
/// <summary>
/// Sets the password for a password-protected database. A password-protected database is
/// unusable for any operation until the password has been set.
@@ -977,7 +977,7 @@ namespace Mono.Data.Sqlite
_password = databasePassword;
}
#endif
-
+
/// <summary>
/// Expand the filename of the data source, resolving the |DataDirectory| macro as appropriate.
/// </summary>
@@ -1957,7 +1957,7 @@ namespace Mono.Data.Sqlite
get { return 3; }
}
- public int LastInsertRowId {
+ public long LastInsertRowId {
get { return _sql.GetLastInsertRowId (); }
}
@@ -1991,7 +1991,7 @@ namespace Mono.Data.Sqlite
internal delegate void SqliteRollbackCallback();
/// <summary>
- /// Raised when a transaction is about to be committed. To roll back a transaction, set the
+ /// Raised when a transaction is about to be committed. To roll back a transaction, set the
/// rollbackTrans boolean value to true.
/// </summary>
/// <param name="sender">The connection committing the transaction</param>
diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteConnectionStringBuilder.cs b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteConnectionStringBuilder.cs
index 2fa72ce..bb813f0 100644
--- a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteConnectionStringBuilder.cs
+++ b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteConnectionStringBuilder.cs
@@ -18,10 +18,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
-//
+//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
-//
+//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -34,7 +34,7 @@
/********************************************************
* ADO.NET 2.0 Data Provider for Sqlite Version 3.X
* Written by Robert Simpson (robert blackcastlesoft com)
- *
+ *
* Released to the public domain, use at your own risk!
********************************************************/
#if NET_2_0
@@ -189,7 +189,7 @@ namespace Mono.Data.Sqlite
}
}
#endregion
-
+
/// <summary>
/// Determines whether or not the connection will automatically participate
/// in the current distributed transaction (if one exists)
diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteConvert.cs b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteConvert.cs
index 725b5f2..c168d44 100644
--- a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteConvert.cs
+++ b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteConvert.cs
@@ -18,10 +18,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
-//
+//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
-//
+//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -34,7 +34,7 @@
/********************************************************
* ADO.NET 2.0 Data Provider for Sqlite Version 3.X
* Written by Robert Simpson (robert blackcastlesoft com)
- *
+ *
* Released to the public domain, use at your own risk!
********************************************************/
#if NET_2_0
@@ -48,7 +48,7 @@ namespace Mono.Data.Sqlite
using System.Globalization;
using System.Text;
-#if !PLATFORM_COMPACTFRAMEWORK
+#if !PLATFORM_COMPACTFRAMEWORK
using System.ComponentModel.Design;
#endif
@@ -136,7 +136,7 @@ namespace Mono.Data.Sqlite
private static string[] _datetimeFormats = new string[] {
"yyyy-MM-dd HH:mm:ss.fffffff",
"yyyy-MM-dd HH:mm:ss",
- "yyyy-MM-dd HH:mm",
+ "yyyy-MM-dd HH:mm",
"yyyyMMddHHmmss",
"yyyyMMddHHmm",
"yyyyMMddTHHmmssfffffff",
@@ -225,21 +225,21 @@ namespace Mono.Data.Sqlite
{
if (nativestring == IntPtr.Zero)
return null;
-
+
// This assumes a single byte terminates the string.
int len = 0;
while (Marshal.ReadByte (nativestring, len) != 0)
checked {++len;}
-
- unsafe {
+
+ unsafe {
string s = new string ((sbyte*) nativestring, 0, len, _utf8);
len = s.Length;
while (len > 0 && s [len-1] == 0)
--len;
- if (len == s.Length)
+ if (len == s.Length)
return s;
- return s.Substring (0, len);
+ return s.Substring (0, len);
}
}
diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteDataAdapter.cs b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteDataAdapter.cs
index 60bb1d8..592f901 100644
--- a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteDataAdapter.cs
+++ b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteDataAdapter.cs
@@ -18,10 +18,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
-//
+//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
-//
+//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -34,7 +34,7 @@
/********************************************************
* ADO.NET 2.0 Data Provider for Sqlite Version 3.X
* Written by Robert Simpson (robert blackcastlesoft com)
- *
+ *
* Released to the public domain, use at your own risk!
********************************************************/
#if NET_2_0
diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteDataReader.cs b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteDataReader.cs
index f885667..3a38363 100644
--- a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteDataReader.cs
+++ b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteDataReader.cs
@@ -18,10 +18,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
-//
+//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
-//
+//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -34,7 +34,7 @@
/********************************************************
* ADO.NET 2.0 Data Provider for Sqlite Version 3.X
* Written by Robert Simpson (robert blackcastlesoft com)
- *
+ *
* Released to the public domain, use at your own risk!
********************************************************/
#if NET_2_0
@@ -102,7 +102,7 @@ namespace Mono.Data.Sqlite
/// </summary>
private SqliteKeyReader _keyInfo;
#endif
-
+
/// <summary>
/// Internal constructor, initializes the datareader and sets up to begin executing statements
/// </summary>
@@ -236,7 +236,7 @@ namespace Mono.Data.Sqlite
/// <summary>
/// Sqlite is inherently un-typed. All datatypes in Sqlite are natively strings. The definition of the columns of a table
/// and the affinity of returned types are all we have to go on to type-restrict data in the reader.
- ///
+ ///
/// This function attempts to verify that the type of data being requested of a column matches the datatype of the column. In
/// the case of columns that are not backed into a table definition, we attempt to match up the affinity of a column (int, double, string or blob)
/// to a set of known types that closely match that affinity. It's not an exact science, but its the best we can do.
@@ -300,7 +300,7 @@ namespace Mono.Data.Sqlite
if (i >= VisibleFieldCount && _keyInfo != null)
return _keyInfo.GetBoolean(i - VisibleFieldCount);
#endif
-
+
VerifyType(i, DbType.Boolean);
return Convert.ToBoolean(GetValue(i), CultureInfo.CurrentCulture);
}
@@ -316,7 +316,7 @@ namespace Mono.Data.Sqlite
if (i >= VisibleFieldCount && _keyInfo != null)
return _keyInfo.GetByte(i - VisibleFieldCount);
#endif
-
+
VerifyType(i, DbType.Byte);
return Convert.ToByte(_activeStatement._sql.GetInt32(_activeStatement, i));
}
@@ -339,7 +339,7 @@ namespace Mono.Data.Sqlite
if (i >= VisibleFieldCount && _keyInfo != null)
return _keyInfo.GetBytes(i - VisibleFieldCount, fieldOffset, buffer, bufferoffset, length);
#endif
-
+
VerifyType(i, DbType.Binary);
return _activeStatement._sql.GetBytes(_activeStatement, i, (int)fieldOffset, buffer, bufferoffset, length);
}
@@ -355,7 +355,7 @@ namespace Mono.Data.Sqlite
if (i >= VisibleFieldCount && _keyInfo != null)
return _keyInfo.GetChar(i - VisibleFieldCount);
#endif
-
+
VerifyType(i, DbType.SByte);
return Convert.ToChar(_activeStatement._sql.GetInt32(_activeStatement, i));
}
@@ -378,7 +378,7 @@ namespace Mono.Data.Sqlite
if (i >= VisibleFieldCount && _keyInfo != null)
return _keyInfo.GetChars(i - VisibleFieldCount, fieldoffset, buffer, bufferoffset, length);
#endif
-
+
VerifyType(i, DbType.String);
return _activeStatement._sql.GetChars(_activeStatement, i, (int)fieldoffset, buffer, bufferoffset, length);
}
@@ -396,7 +396,7 @@ namespace Mono.Data.Sqlite
if (i >= VisibleFieldCount && _keyInfo != null)
return _keyInfo.GetDataTypeName(i - VisibleFieldCount);
#endif
-
+
SqliteType typ = GetSqliteType(i);
if (typ.Type == DbType.Object) return SqliteConvert.SqliteTypeToType(typ).Name;
return _activeStatement._sql.ColumnType(_activeStatement, i, out typ.Affinity);
@@ -413,7 +413,7 @@ namespace Mono.Data.Sqlite
if (i >= VisibleFieldCount && _keyInfo != null)
return _keyInfo.GetDateTime(i - VisibleFieldCount);
#endif
-
+
VerifyType(i, DbType.DateTime);
return _activeStatement._sql.GetDateTime(_activeStatement, i);
}
@@ -429,7 +429,7 @@ namespace Mono.Data.Sqlite
if (i >= VisibleFieldCount && _keyInfo != null)
return _keyInfo.GetDecimal(i - VisibleFieldCount);
#endif
-
+
VerifyType(i, DbType.Decimal);
return Convert.ToDecimal(_activeStatement._sql.GetDouble(_activeStatement, i));
}
@@ -445,7 +445,7 @@ namespace Mono.Data.Sqlite
if (i >= VisibleFieldCount && _keyInfo != null)
return _keyInfo.GetDouble(i - VisibleFieldCount);
#endif
-
+
VerifyType(i, DbType.Double);
return _activeStatement._sql.GetDouble(_activeStatement, i);
}
@@ -463,7 +463,7 @@ namespace Mono.Data.Sqlite
if (i >= VisibleFieldCount && _keyInfo != null)
return _keyInfo.GetFieldType(i - VisibleFieldCount);
#endif
-
+
return SqliteConvert.SqliteTypeToType(GetSqliteType(i));
}
@@ -478,7 +478,7 @@ namespace Mono.Data.Sqlite
if (i >= VisibleFieldCount && _keyInfo != null)
return _keyInfo.GetFloat(i - VisibleFieldCount);
#endif
-
+
VerifyType(i, DbType.Single);
return Convert.ToSingle(_activeStatement._sql.GetDouble(_activeStatement, i));
}
@@ -494,7 +494,7 @@ namespace Mono.Data.Sqlite
if (i >= VisibleFieldCount && _keyInfo != null)
return _keyInfo.GetGuid(i - VisibleFieldCount);
#endif
-
+
TypeAffinity affinity = VerifyType(i, DbType.Guid);
if (affinity == TypeAffinity.Blob)
{
@@ -517,7 +517,7 @@ namespace Mono.Data.Sqlite
if (i >= VisibleFieldCount && _keyInfo != null)
return _keyInfo.GetInt16(i - VisibleFieldCount);
#endif
-
+
VerifyType(i, DbType.Int16);
return Convert.ToInt16(_activeStatement._sql.GetInt32(_activeStatement, i));
}
@@ -533,7 +533,7 @@ namespace Mono.Data.Sqlite
if (i >= VisibleFieldCount && _keyInfo != null)
return _keyInfo.GetInt32(i - VisibleFieldCount);
#endif
-
+
VerifyType(i, DbType.Int32);
return _activeStatement._sql.GetInt32(_activeStatement, i);
}
@@ -549,7 +549,7 @@ namespace Mono.Data.Sqlite
if (i >= VisibleFieldCount && _keyInfo != null)
return _keyInfo.GetInt64(i - VisibleFieldCount);
#endif
-
+
VerifyType(i, DbType.Int64);
return _activeStatement._sql.GetInt64(_activeStatement, i);
}
@@ -566,7 +566,7 @@ namespace Mono.Data.Sqlite
if (i >= VisibleFieldCount && _keyInfo != null)
return _keyInfo.GetName(i - VisibleFieldCount);
#endif
-
+
return _activeStatement._sql.ColumnName(_activeStatement, i);
}
@@ -586,7 +586,7 @@ namespace Mono.Data.Sqlite
if (r > -1) r += VisibleFieldCount;
}
#endif
-
+
return r;
}
@@ -666,7 +666,7 @@ namespace Mono.Data.Sqlite
strColumn = _command.Connection._sql.ColumnOriginalName(_activeStatement, n);
if (String.IsNullOrEmpty(strColumn) == false) row[SchemaTableColumn.BaseColumnName] = strColumn;
-
+
row[SchemaTableColumn.IsExpression] = String.IsNullOrEmpty(strColumn);
row[SchemaTableColumn.IsAliased] = (String.Compare(GetName(n), strColumn, true, CultureInfo.InvariantCulture) != 0);
@@ -781,7 +781,7 @@ namespace Mono.Data.Sqlite
}
}
}
-
+
if (String.IsNullOrEmpty(dataType))
{
TypeAffinity affin;
@@ -798,7 +798,7 @@ namespace Mono.Data.Sqlite
if (_keyInfo != null)
_keyInfo.AppendSchemaTable(tbl);
#endif
-
+
tbl.AcceptChanges();
tbl.EndLoadData();
@@ -816,7 +816,7 @@ namespace Mono.Data.Sqlite
if (i >= VisibleFieldCount && _keyInfo != null)
return _keyInfo.GetString(i - VisibleFieldCount);
#endif
-
+
VerifyType(i, DbType.String);
return _activeStatement._sql.GetText(_activeStatement, i);
}
@@ -909,7 +909,7 @@ namespace Mono.Data.Sqlite
{
// Reset the previously-executed statement
_activeStatement._sql.Reset(_activeStatement);
-
+
// If we're only supposed to return a single rowset, step through all remaining statements once until
// they are all done and return false to indicate no more resultsets exist.
if ((_commandBehavior & CommandBehavior.SingleResult) != 0)
@@ -996,7 +996,7 @@ namespace Mono.Data.Sqlite
typ = _fieldTypeArray[i];
- // If not initialized, then fetch the declared column datatype and attempt to convert it
+ // If not initialized, then fetch the declared column datatype and attempt to convert it
// to a known DbType.
if (typ.Affinity == TypeAffinity.Uninitialized)
typ.Type = SqliteConvert.TypeNameToDbType(_activeStatement._sql.ColumnType(_activeStatement, i, out typ.Affinity));
@@ -1027,7 +1027,7 @@ namespace Mono.Data.Sqlite
if (_keyInfo != null)
_keyInfo.Reset();
#endif
-
+
return true;
}
diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteEnlistment.cs b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteEnlistment.cs
index 864eaa1..e2caed7 100644
--- a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteEnlistment.cs
+++ b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteEnlistment.cs
@@ -18,10 +18,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
-//
+//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
-//
+//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -34,7 +34,7 @@
/*******************************************************
* ADO.NET 2.0 Data Provider for Sqlite Version 3.X
* Written by Robert Simpson (robert blackcastlesoft com)
- *
+ *
* Released to the public domain, use at your own risk!
********************************************************/
#if NET_2_0
diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteException.cs b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteException.cs
index 5f51ae3..820dcce 100644
--- a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteException.cs
+++ b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteException.cs
@@ -18,10 +18,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
-//
+//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
-//
+//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -34,7 +34,7 @@
/********************************************************
* ADO.NET 2.0 Data Provider for Sqlite Version 3.X
* Written by Robert Simpson (robert blackcastlesoft com)
- *
+ *
* Released to the public domain, use at your own risk!
********************************************************/
#if NET_2_0
diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteFactory.cs b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteFactory.cs
index 7fe6f8e..a9a5bce 100644
--- a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteFactory.cs
+++ b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteFactory.cs
@@ -18,10 +18,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
-//
+//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
-//
+//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -34,7 +34,7 @@
/********************************************************
* ADO.NET 2.0 Data Provider for Sqlite Version 3.X
* Written by Robert Simpson (robert blackcastlesoft com)
- *
+ *
* Released to the public domain, use at your own risk!
********************************************************/
#if NET_2_0
diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteFunction.cs b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteFunction.cs
index 5f3a5a6..7f0a38b 100644
--- a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteFunction.cs
+++ b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteFunction.cs
@@ -18,10 +18,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
-//
+//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
-//
+//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -34,7 +34,7 @@
/********************************************************
* ADO.NET 2.0 Data Provider for Sqlite Version 3.X
* Written by Robert Simpson (robert blackcastlesoft com)
- *
+ *
* Released to the public domain, use at your own risk!
********************************************************/
#if NET_2_0
@@ -99,11 +99,11 @@ namespace Mono.Data.Sqlite
/// Although there is one instance of a class derived from SqliteFunction per database connection, the derived class has no access
/// to the underlying connection. This is necessary to deter implementers from thinking it would be a good idea to make database
/// calls during processing.
- ///
+ ///
/// It is important to distinguish between a per-connection instance, and a per-SQL statement context. One instance of this class
/// services all SQL statements being stepped through on that connection, and there can be many. One should never store per-statement
/// information in member variables of user-defined function classes.
- ///
+ ///
/// For aggregate functions, always create and store your per-statement data in the contextData object on the 1st step. This data will
/// be automatically freed for you (and Dispose() called if the item supports IDisposable) when the statement completes.
/// </remarks>
@@ -374,7 +374,7 @@ namespace Mono.Data.Sqlite
if (n > 1) obj = _contextDataList[nAux];
Step(ConvertParams(nArgs, argsptr), n, ref obj);
- _contextDataList[nAux] = obj;
+ _contextDataList[nAux] = obj;
}
/// <summary>
@@ -464,7 +464,7 @@ namespace Mono.Data.Sqlite
break;
}
}
-
+
if (found == false)
continue;
diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteFunctionAttribute.cs b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteFunctionAttribute.cs
index a455b93..bd774b6 100644
--- a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteFunctionAttribute.cs
+++ b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteFunctionAttribute.cs
@@ -18,10 +18,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
-//
+//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
-//
+//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -34,7 +34,7 @@
/********************************************************
* ADO.NET 2.0 Data Provider for Sqlite Version 3.X
* Written by Robert Simpson (robert blackcastlesoft com)
- *
+ *
* Released to the public domain, use at your own risk!
********************************************************/
#if NET_2_0
diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteMetaDataCollectionNames.cs b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteMetaDataCollectionNames.cs
index fab3e1a..abebe04 100644
--- a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteMetaDataCollectionNames.cs
+++ b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteMetaDataCollectionNames.cs
@@ -18,10 +18,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
-//
+//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
-//
+//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -34,7 +34,7 @@
/********************************************************
* ADO.NET 2.0 Data Provider for Sqlite Version 3.X
* Written by Robert Simpson (robert blackcastlesoft com)
- *
+ *
* Released to the public domain, use at your own risk!
********************************************************/
#if NET_2_0
diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteParameter.cs b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteParameter.cs
index d85d574..4dba90f 100644
--- a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteParameter.cs
+++ b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteParameter.cs
@@ -18,10 +18,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
-//
+//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
-//
+//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -34,7 +34,7 @@
/********************************************************
* ADO.NET 2.0 Data Provider for Sqlite Version 3.X
* Written by Robert Simpson (robert blackcastlesoft com)
- *
+ *
* Released to the public domain, use at your own risk!
********************************************************/
#if NET_2_0
@@ -81,7 +81,7 @@ namespace Mono.Data.Sqlite
/// <summary>
/// Default constructor
/// </summary>
- public SqliteParameter()
+ public SqliteParameter()
: this(null, (DbType)(-1), 0, null, DataRowVersion.Current)
{
}
@@ -211,7 +211,7 @@ namespace Mono.Data.Sqlite
/// <param name="parameterSize">The size of the parameter</param>
/// <param name="sourceColumn">The source column</param>
/// <param name="rowVersion">The row version information</param>
- public SqliteParameter(string parameterName, DbType parameterType, int parameterSize, string sourceColumn, DataRowVersion rowVersion)
+ public SqliteParameter(string parameterName, DbType parameterType, int parameterSize, string sourceColumn, DataRowVersion rowVersion)
{
_parameterName = parameterName;
_dbType = (int)parameterType;
@@ -241,7 +241,7 @@ namespace Mono.Data.Sqlite
/// <param name="scale">Ignored</param>
/// <param name="sourceColumn">The source column</param>
/// <param name="rowVersion">The row version information</param>
- /// <param name="value">The initial value to assign the parameter</param>
+ /// <param name="value">The initial value to assign the parameter</param>
#if !PLATFORM_COMPACTFRAMEWORK
[EditorBrowsable(EditorBrowsableState.Advanced)]
#endif
@@ -319,7 +319,7 @@ namespace Mono.Data.Sqlite
{
return _nullable;
}
- set
+ set
{
_nullable = value;
}
@@ -461,7 +461,7 @@ namespace Mono.Data.Sqlite
set
{
_objValue = value;
- if (_dbType == -1 && _objValue != null && _objValue != DBNull.Value) // If the DbType has never been assigned, try to glean one from the value's datatype
+ if (_dbType == -1 && _objValue != null && _objValue != DBNull.Value) // If the DbType has never been assigned, try to glean one from the value's datatype
_dbType = (int)SqliteConvert.TypeToDbType(_objValue.GetType());
}
}
diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteParameterCollection.cs b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteParameterCollection.cs
index 2267c27..c0f8b0a 100644
--- a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteParameterCollection.cs
+++ b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteParameterCollection.cs
@@ -18,10 +18,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
-//
+//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
-//
+//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -34,7 +34,7 @@
/********************************************************
* ADO.NET 2.0 Data Provider for Sqlite Version 3.X
* Written by Robert Simpson (robert blackcastlesoft com)
- *
+ *
* Released to the public domain, use at your own risk!
********************************************************/
#if NET_2_0
diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteStatement.cs b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteStatement.cs
index 2ff1a20..d12f72c 100644
--- a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteStatement.cs
+++ b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteStatement.cs
@@ -18,10 +18,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
-//
+//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
-//
+//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -34,7 +34,7 @@
/********************************************************
* ADO.NET 2.0 Data Provider for Sqlite Version 3.X
* Written by Robert Simpson (robert blackcastlesoft com)
- *
+ *
* Released to the public domain, use at your own risk!
********************************************************/
#if NET_2_0
@@ -132,7 +132,7 @@ namespace Mono.Data.Sqlite
internal bool MapParameter(string s, SqliteParameter p)
{
if (_paramNames == null) return false;
-
+
int startAt = 0;
if (s.Length > 0)
{
@@ -159,7 +159,7 @@ namespace Mono.Data.Sqlite
public void Dispose()
{
_sql.FinalizeStatement(this);
-
+
_paramNames = null;
_paramValues = null;
_sql = null;
@@ -168,7 +168,7 @@ namespace Mono.Data.Sqlite
GC.SuppressFinalize(this);
}
#endregion
-
+
/// <summary>
/// Bind all parameters, making sure the caller didn't miss any
/// </summary>
diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteTransaction.cs b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteTransaction.cs
index dc79c86..9678f0a 100644
--- a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteTransaction.cs
+++ b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SQLiteTransaction.cs
@@ -18,10 +18,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
-//
+//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
-//
+//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -34,7 +34,7 @@
/********************************************************
* ADO.NET 2.0 Data Provider for Sqlite Version 3.X
* Written by Robert Simpson (robert blackcastlesoft com)
- *
+ *
* Released to the public domain, use at your own risk!
********************************************************/
#if NET_2_0
diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SR.Designer.cs b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SR.Designer.cs
index a78fcd2..944c047 100644
--- a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SR.Designer.cs
+++ b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SR.Designer.cs
@@ -18,10 +18,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
-//
+//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
-//
+//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -43,8 +43,8 @@
#if NET_2_0
namespace Mono.Data.Sqlite {
using System;
-
-
+
+
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
@@ -55,15 +55,15 @@ namespace Mono.Data.Sqlite {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
internal class SR {
-
+
private static global::System.Resources.ResourceManager resourceMan;
-
+
private static global::System.Globalization.CultureInfo resourceCulture;
-
+
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal SR() {
}
-
+
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
@@ -77,7 +77,7 @@ namespace Mono.Data.Sqlite {
return resourceMan;
}
}
-
+
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
@@ -91,7 +91,7 @@ namespace Mono.Data.Sqlite {
resourceCulture = value;
}
}
-
+
/// <summary>
/// Looks up a localized string similar to <?xml version="1.0" standalone="yes"?>
///<DocumentElement>
@@ -113,7 +113,7 @@ namespace Mono.Data.Sqlite {
return ResourceManager.GetString("DataTypes", resourceCulture);
}
}
-
+
/// <summary>
/// Looks up a localized string similar to ALL,ALTER,AND,AS,AUTOINCREMENT,BETWEEN,BY,CASE,CHECK,COLLATE,COMMIT,CONSTRAINT,CREATE,CROSS,DEFAULT,DEFERRABLE,DELETE,DISTINCT,DROP,ELSE,ESCAPE,EXCEPT,FOREIGN,FROM,FULL,GROUP,HAVING,IN,INDEX,INNER,INSERT,INTERSECT,INTO,IS,ISNULL,JOIN,LEFT,LIMIT,NATURAL,NOT,NOTNULL,NULL,ON,OR,ORDER,OUTER,PRIMARY,REFERENCES,RIGHT,ROLLBACK,SELECT,SET,TABLE,THEN,TO,TRANSACTION,UNION,UNIQUE,UPDATE,USING,VALUES,WHEN,WHERE.
/// </summary>
@@ -122,7 +122,7 @@ namespace Mono.Data.Sqlite {
return ResourceManager.GetString("Keywords", resourceCulture);
}
}
-
+
/// <summary>
/// Looks up a localized string similar to <?xml version="1.0" encoding="utf-8" ?>
///<DocumentElement>
diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SqliteDataSourceEnumerator.cs b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SqliteDataSourceEnumerator.cs
index 050e2e4..2ac1c8a 100644
--- a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SqliteDataSourceEnumerator.cs
+++ b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/SqliteDataSourceEnumerator.cs
@@ -16,10 +16,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
-//
+//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
-//
+//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -34,7 +34,7 @@
using System;
using System.Data;
using System.Data.Common;
-
+
namespace Mono.Data.Sqlite
{
public class SqliteDataSourceEnumerator : DbDataSourceEnumerator
@@ -72,7 +72,7 @@ namespace Mono.Data.Sqlite
dt.Rows.Add (dr);
return dt;
- }
+ }
}
}
diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/UnsafeNativeMethods.cs b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/UnsafeNativeMethods.cs
index 3ff2498..b68a7b9 100644
--- a/src/Mono.Data.Sqlite/Mono.Data.Sqlite/UnsafeNativeMethods.cs
+++ b/src/Mono.Data.Sqlite/Mono.Data.Sqlite/UnsafeNativeMethods.cs
@@ -18,10 +18,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
-//
+//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
-//
+//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -34,7 +34,7 @@
/********************************************************
* ADO.NET 2.0 Data Provider for Sqlite Version 3.X
* Written by Robert Simpson (robert blackcastlesoft com)
- *
+ *
* Released to the public domain, use at your own risk!
********************************************************/
#if NET_2_0
@@ -90,7 +90,7 @@ namespace Mono.Data.Sqlite
[DllImport(SQLITE_DLL)]
internal static extern int sqlite3_prepare(IntPtr db, IntPtr pSql, int nBytes, out IntPtr stmt, out IntPtr ptrRemain);
-
+
[DllImport(SQLITE_DLL)]
internal static extern int sqlite3_bind_blob(IntPtr stmt, int index, Byte[] value, int nSize, IntPtr nTransient);
@@ -303,9 +303,9 @@ namespace Mono.Data.Sqlite
[DllImport(SQLITE_DLL)]
internal static extern int sqlite3_table_cursor(IntPtr stmt, int db, int tableRootPage);
-
+
[DllImport(SQLITE_DLL)]
- internal static extern int sqlite3_last_insert_rowid(IntPtr db);
+ internal static extern long sqlite3_last_insert_rowid(IntPtr db);
}
}
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
