// SqlDataReader state data for ExecuteReader()
private SqlDataReader dataReader = null;
private string[] queries = null;
- private int currentQuery;
+ private int currentQuery = -1;
private CommandBehavior cmdBehavior = CommandBehavior.Default;
private ParmUtil parmUtil = null;
currentQuery = -1;
dataReader = new SqlDataReader(this);
- if((behavior & CommandBehavior.SingleResult) == CommandBehavior.SingleResult) {
- queries = new String[1];
- queries[0] = sql;
- }
- else {
- queries = sql.Split(new Char[] {';'});
- }
+ queries = sql.Split(new Char[] {';'});
dataReader.NextResult();
{
SqlResult res = new SqlResult();
res.Connection = this.Connection;
+ res.Behavior = cmdBehavior;
string statement;
currentQuery++;
+ res.CurrentQuery = currentQuery;
+
if(currentQuery < queries.Length && queries[currentQuery].Equals("") == false) {
+ res.SQL = queries[currentQuery];
statement = TweakQuery(queries[currentQuery], cmdType);
ExecuteQuery(statement, res);
res.ResultReturned = true;
private SqlConnection con = null;
private int rowsAffected = -1;
private ExecStatusType execStatus = ExecStatusType.PGRES_FATAL_ERROR;
+ private int currentQuery = -1;
+ private string sql = "";
+ private CommandBehavior cmdBehavior = CommandBehavior.Default;
+
+ internal CommandBehavior Behavior {
+ get {
+ return cmdBehavior;
+ }
+ set {
+ cmdBehavior = value;
+ }
+ }
+
+ internal string SQL {
+ get {
+ return sql;
+ }
+ set {
+ sql = value;
+ }
+ }
internal ExecStatusType ExecStatus {
get {
}
}
+ internal int CurrentQuery {
+ get {
+ return currentQuery;
+ }
+
+ set {
+ currentQuery = value;
+ }
+
+ }
+
internal SqlConnection Connection {
+ get {
+ return con;
+ }
+
set {
con = value;
}
dataTableSchema.Columns.Add ("NumericScale", typeof (int));
dataTableSchema.Columns.Add ("IsUnique", typeof (bool));
dataTableSchema.Columns.Add ("IsKey", typeof (bool));
+ DataColumn dc = dataTableSchema.Columns["IsKey"];
+ dc.AllowDBNull = true; // IsKey can have a DBNull
dataTableSchema.Columns.Add ("BaseCatalogName", typeof (string));
dataTableSchema.Columns.Add ("BaseColumnName", typeof (string));
dataTableSchema.Columns.Add ("BaseSchemaName", typeof (string));
fieldCount = PostgresLibrary.PQnfields (pgResult);
rowCount = PostgresLibrary.PQntuples(pgResult);
pgtypes = new string[fieldCount];\r
+\r
+ // TODO: for CommandBehavior.SingleRow\r
+ // use IRow, otherwise, IRowset\r
+ if(fieldCount > 0)\r
+ if((cmdBehavior & CommandBehavior.SingleRow) == CommandBehavior.SingleRow)\r
+ fieldCount = 1;\r
+
+ // TODO: for CommandBehavior.SchemaInfo
+ if((cmdBehavior & CommandBehavior.SchemaOnly) == CommandBehavior.SchemaOnly)
+ fieldCount = 0;
+
+ // TODO: for CommandBehavior.SingleResult
+ if((cmdBehavior & CommandBehavior.SingleResult) == CommandBehavior.SingleResult)
+ if(currentQuery > 0)
+ fieldCount = 0;
+
+ // TODO: for CommandBehavior.SequentialAccess - used for reading Large OBjects
+ //if((cmdBehavior & CommandBehavior.SequentialAccess) == CommandBehavior.SequentialAccess) {
+ //}
DataRow schemaRow;
int oid;
for (int i = 0; i < fieldCount; i += 1 ) {
schemaRow = dataTableSchema.NewRow ();
- schemaRow["ColumnName"] = PostgresLibrary.PQfname (pgResult, i);
+ string columnName = PostgresLibrary.PQfname (pgResult, i);
+
+ schemaRow["ColumnName"] = columnName;
schemaRow["ColumnOrdinal"] = i+1;
schemaRow["ColumnSize"] = PostgresLibrary.PQfsize (pgResult, i);
schemaRow["NumericPrecision"] = 0;
schemaRow["NumericScale"] = 0;
- schemaRow["IsUnique"] = false;
- schemaRow["IsKey"] = false;
+ if((cmdBehavior & CommandBehavior.SingleResult) == CommandBehavior.KeyInfo) {
+ bool IsUnique, IsKey;
+ GetKeyInfo(columnName, out IsUnique, out IsKey);
+ }
+ else {
+ schemaRow["IsUnique"] = false;
+ schemaRow["IsKey"] = DBNull.Value;
+ }
schemaRow["BaseCatalogName"] = "";
- schemaRow["BaseColumnName"] = PostgresLibrary.PQfname (pgResult, i);
+ schemaRow["BaseColumnName"] = columnName;
schemaRow["BaseSchemaName"] = "";
- schemaRow["BaseTableName"] = "";
+ schemaRow["BaseTableName"] = "";
// PostgreSQL type to .NET type stuff
oid = PostgresLibrary.PQftype (pgResult, i);
schemaRow["IsLong"] = false;
schemaRow["IsReadOnly"] = false;
schemaRow.AcceptChanges();
- dataTableSchema.Rows.Add (schemaRow);
+ dataTableSchema.Rows.Add (schemaRow);
}
-
+
#if DEBUG_SqlCommand
Console.WriteLine("********** DEBUG Table Schema BEGIN ************");
foreach (DataRow myRow in dataTableSchema.Rows) {\r
}
}
+
+ // TODO: how do we get the key info if
+ // we don't have the tableName?
+ private void GetKeyInfo(string columnName, out bool isUnique, out bool isKey) {
+ isUnique = false;
+ isKey = false;
+
+ string sql;
+
+ sql =
+ "SELECT i.indkey, i.indisprimary, i.indisunique " +
+ "FROM pg_class c, pg_class c2, pg_index i " +
+ "WHERE c.relname = ':tableName' AND c.oid = i.indrelid " +
+ "AND i.indexrelid = c2.oid ";
+ }
}
}
private void CloseDataSource () {
// FIXME: just a quick hack
if(conState == ConnectionState.Open) {
+ if(trans != null)
+ if(trans.DoingTransaction == true) {
+ trans.Rollback();
+ // trans.Dispose();
+ trans = null;
+ }
+
conState = ConnectionState.Closed;
PostgresLibrary.PQfinish (pgConn);
pgConn = IntPtr.Zero;
// SqlDataReader state data for ExecuteReader()
private SqlDataReader dataReader = null;
private string[] queries = null;
- private int currentQuery;
+ private int currentQuery = -1;
private CommandBehavior cmdBehavior = CommandBehavior.Default;
private ParmUtil parmUtil = null;
currentQuery = -1;
dataReader = new SqlDataReader(this);
- if((behavior & CommandBehavior.SingleResult) == CommandBehavior.SingleResult) {
- queries = new String[1];
- queries[0] = sql;
- }
- else {
- queries = sql.Split(new Char[] {';'});
- }
+ queries = sql.Split(new Char[] {';'});
dataReader.NextResult();
{
SqlResult res = new SqlResult();
res.Connection = this.Connection;
+ res.Behavior = cmdBehavior;
string statement;
currentQuery++;
+ res.CurrentQuery = currentQuery;
+
if(currentQuery < queries.Length && queries[currentQuery].Equals("") == false) {
+ res.SQL = queries[currentQuery];
statement = TweakQuery(queries[currentQuery], cmdType);
ExecuteQuery(statement, res);
res.ResultReturned = true;
private SqlConnection con = null;
private int rowsAffected = -1;
private ExecStatusType execStatus = ExecStatusType.PGRES_FATAL_ERROR;
+ private int currentQuery = -1;
+ private string sql = "";
+ private CommandBehavior cmdBehavior = CommandBehavior.Default;
+
+ internal CommandBehavior Behavior {
+ get {
+ return cmdBehavior;
+ }
+ set {
+ cmdBehavior = value;
+ }
+ }
+
+ internal string SQL {
+ get {
+ return sql;
+ }
+ set {
+ sql = value;
+ }
+ }
internal ExecStatusType ExecStatus {
get {
}
}
+ internal int CurrentQuery {
+ get {
+ return currentQuery;
+ }
+
+ set {
+ currentQuery = value;
+ }
+
+ }
+
internal SqlConnection Connection {
+ get {
+ return con;
+ }
+
set {
con = value;
}
dataTableSchema.Columns.Add ("NumericScale", typeof (int));
dataTableSchema.Columns.Add ("IsUnique", typeof (bool));
dataTableSchema.Columns.Add ("IsKey", typeof (bool));
+ DataColumn dc = dataTableSchema.Columns["IsKey"];
+ dc.AllowDBNull = true; // IsKey can have a DBNull
dataTableSchema.Columns.Add ("BaseCatalogName", typeof (string));
dataTableSchema.Columns.Add ("BaseColumnName", typeof (string));
dataTableSchema.Columns.Add ("BaseSchemaName", typeof (string));
fieldCount = PostgresLibrary.PQnfields (pgResult);
rowCount = PostgresLibrary.PQntuples(pgResult);
pgtypes = new string[fieldCount];\r
+\r
+ // TODO: for CommandBehavior.SingleRow\r
+ // use IRow, otherwise, IRowset\r
+ if(fieldCount > 0)\r
+ if((cmdBehavior & CommandBehavior.SingleRow) == CommandBehavior.SingleRow)\r
+ fieldCount = 1;\r
+
+ // TODO: for CommandBehavior.SchemaInfo
+ if((cmdBehavior & CommandBehavior.SchemaOnly) == CommandBehavior.SchemaOnly)
+ fieldCount = 0;
+
+ // TODO: for CommandBehavior.SingleResult
+ if((cmdBehavior & CommandBehavior.SingleResult) == CommandBehavior.SingleResult)
+ if(currentQuery > 0)
+ fieldCount = 0;
+
+ // TODO: for CommandBehavior.SequentialAccess - used for reading Large OBjects
+ //if((cmdBehavior & CommandBehavior.SequentialAccess) == CommandBehavior.SequentialAccess) {
+ //}
DataRow schemaRow;
int oid;
for (int i = 0; i < fieldCount; i += 1 ) {
schemaRow = dataTableSchema.NewRow ();
- schemaRow["ColumnName"] = PostgresLibrary.PQfname (pgResult, i);
+ string columnName = PostgresLibrary.PQfname (pgResult, i);
+
+ schemaRow["ColumnName"] = columnName;
schemaRow["ColumnOrdinal"] = i+1;
schemaRow["ColumnSize"] = PostgresLibrary.PQfsize (pgResult, i);
schemaRow["NumericPrecision"] = 0;
schemaRow["NumericScale"] = 0;
- schemaRow["IsUnique"] = false;
- schemaRow["IsKey"] = false;
+ if((cmdBehavior & CommandBehavior.SingleResult) == CommandBehavior.KeyInfo) {
+ bool IsUnique, IsKey;
+ GetKeyInfo(columnName, out IsUnique, out IsKey);
+ }
+ else {
+ schemaRow["IsUnique"] = false;
+ schemaRow["IsKey"] = DBNull.Value;
+ }
schemaRow["BaseCatalogName"] = "";
- schemaRow["BaseColumnName"] = PostgresLibrary.PQfname (pgResult, i);
+ schemaRow["BaseColumnName"] = columnName;
schemaRow["BaseSchemaName"] = "";
- schemaRow["BaseTableName"] = "";
+ schemaRow["BaseTableName"] = "";
// PostgreSQL type to .NET type stuff
oid = PostgresLibrary.PQftype (pgResult, i);
schemaRow["IsLong"] = false;
schemaRow["IsReadOnly"] = false;
schemaRow.AcceptChanges();
- dataTableSchema.Rows.Add (schemaRow);
+ dataTableSchema.Rows.Add (schemaRow);
}
-
+
#if DEBUG_SqlCommand
Console.WriteLine("********** DEBUG Table Schema BEGIN ************");
foreach (DataRow myRow in dataTableSchema.Rows) {\r
}
}
+
+ // TODO: how do we get the key info if
+ // we don't have the tableName?
+ private void GetKeyInfo(string columnName, out bool isUnique, out bool isKey) {
+ isUnique = false;
+ isKey = false;
+
+ string sql;
+
+ sql =
+ "SELECT i.indkey, i.indisprimary, i.indisunique " +
+ "FROM pg_class c, pg_class c2, pg_index i " +
+ "WHERE c.relname = ':tableName' AND c.oid = i.indrelid " +
+ "AND i.indexrelid = c2.oid ";
+ }
}
}
private void CloseDataSource () {
// FIXME: just a quick hack
if(conState == ConnectionState.Open) {
+ if(trans != null)
+ if(trans.DoingTransaction == true) {
+ trans.Rollback();
+ // trans.Dispose();
+ trans = null;
+ }
+
conState = ConnectionState.Closed;
PostgresLibrary.PQfinish (pgConn);
pgConn = IntPtr.Zero;
+2002-05-26 Daniel Morgan <danmorg@sc.rr.com>
+
+ * System.Data/DataRow.cs: modified
+ support setting of DBNull.Value
+ using the Item indexer this[DataColumn]
+
+ * System.Data.SqlClient/SqlCommand.cs: modified
+ tweaks to show TODO's for other CommandBehavior.
+ Set AllowDBNull column to true for IsKey row
+ in schema DataTable.
+
+ * System.Data.SqlClient/SqlConnection.cs: modified
+ if transaction is in progress when a Close() is called,
+ do a transaction Rollback.
+
2002-05-26 Daniel Morgan <danmorg@sc.rr.com>
* Test/SqlSharpCli.cs: added file
// SqlDataReader state data for ExecuteReader()
private SqlDataReader dataReader = null;
private string[] queries = null;
- private int currentQuery;
+ private int currentQuery = -1;
private CommandBehavior cmdBehavior = CommandBehavior.Default;
private ParmUtil parmUtil = null;
currentQuery = -1;
dataReader = new SqlDataReader(this);
- if((behavior & CommandBehavior.SingleResult) == CommandBehavior.SingleResult) {
- queries = new String[1];
- queries[0] = sql;
- }
- else {
- queries = sql.Split(new Char[] {';'});
- }
+ queries = sql.Split(new Char[] {';'});
dataReader.NextResult();
{
SqlResult res = new SqlResult();
res.Connection = this.Connection;
+ res.Behavior = cmdBehavior;
string statement;
currentQuery++;
+ res.CurrentQuery = currentQuery;
+
if(currentQuery < queries.Length && queries[currentQuery].Equals("") == false) {
+ res.SQL = queries[currentQuery];
statement = TweakQuery(queries[currentQuery], cmdType);
ExecuteQuery(statement, res);
res.ResultReturned = true;
private SqlConnection con = null;
private int rowsAffected = -1;
private ExecStatusType execStatus = ExecStatusType.PGRES_FATAL_ERROR;
+ private int currentQuery = -1;
+ private string sql = "";
+ private CommandBehavior cmdBehavior = CommandBehavior.Default;
+
+ internal CommandBehavior Behavior {
+ get {
+ return cmdBehavior;
+ }
+ set {
+ cmdBehavior = value;
+ }
+ }
+
+ internal string SQL {
+ get {
+ return sql;
+ }
+ set {
+ sql = value;
+ }
+ }
internal ExecStatusType ExecStatus {
get {
}
}
+ internal int CurrentQuery {
+ get {
+ return currentQuery;
+ }
+
+ set {
+ currentQuery = value;
+ }
+
+ }
+
internal SqlConnection Connection {
+ get {
+ return con;
+ }
+
set {
con = value;
}
dataTableSchema.Columns.Add ("NumericScale", typeof (int));
dataTableSchema.Columns.Add ("IsUnique", typeof (bool));
dataTableSchema.Columns.Add ("IsKey", typeof (bool));
+ DataColumn dc = dataTableSchema.Columns["IsKey"];
+ dc.AllowDBNull = true; // IsKey can have a DBNull
dataTableSchema.Columns.Add ("BaseCatalogName", typeof (string));
dataTableSchema.Columns.Add ("BaseColumnName", typeof (string));
dataTableSchema.Columns.Add ("BaseSchemaName", typeof (string));
fieldCount = PostgresLibrary.PQnfields (pgResult);
rowCount = PostgresLibrary.PQntuples(pgResult);
pgtypes = new string[fieldCount];\r
+\r
+ // TODO: for CommandBehavior.SingleRow\r
+ // use IRow, otherwise, IRowset\r
+ if(fieldCount > 0)\r
+ if((cmdBehavior & CommandBehavior.SingleRow) == CommandBehavior.SingleRow)\r
+ fieldCount = 1;\r
+
+ // TODO: for CommandBehavior.SchemaInfo
+ if((cmdBehavior & CommandBehavior.SchemaOnly) == CommandBehavior.SchemaOnly)
+ fieldCount = 0;
+
+ // TODO: for CommandBehavior.SingleResult
+ if((cmdBehavior & CommandBehavior.SingleResult) == CommandBehavior.SingleResult)
+ if(currentQuery > 0)
+ fieldCount = 0;
+
+ // TODO: for CommandBehavior.SequentialAccess - used for reading Large OBjects
+ //if((cmdBehavior & CommandBehavior.SequentialAccess) == CommandBehavior.SequentialAccess) {
+ //}
DataRow schemaRow;
int oid;
for (int i = 0; i < fieldCount; i += 1 ) {
schemaRow = dataTableSchema.NewRow ();
- schemaRow["ColumnName"] = PostgresLibrary.PQfname (pgResult, i);
+ string columnName = PostgresLibrary.PQfname (pgResult, i);
+
+ schemaRow["ColumnName"] = columnName;
schemaRow["ColumnOrdinal"] = i+1;
schemaRow["ColumnSize"] = PostgresLibrary.PQfsize (pgResult, i);
schemaRow["NumericPrecision"] = 0;
schemaRow["NumericScale"] = 0;
- schemaRow["IsUnique"] = false;
- schemaRow["IsKey"] = false;
+ if((cmdBehavior & CommandBehavior.SingleResult) == CommandBehavior.KeyInfo) {
+ bool IsUnique, IsKey;
+ GetKeyInfo(columnName, out IsUnique, out IsKey);
+ }
+ else {
+ schemaRow["IsUnique"] = false;
+ schemaRow["IsKey"] = DBNull.Value;
+ }
schemaRow["BaseCatalogName"] = "";
- schemaRow["BaseColumnName"] = PostgresLibrary.PQfname (pgResult, i);
+ schemaRow["BaseColumnName"] = columnName;
schemaRow["BaseSchemaName"] = "";
- schemaRow["BaseTableName"] = "";
+ schemaRow["BaseTableName"] = "";
// PostgreSQL type to .NET type stuff
oid = PostgresLibrary.PQftype (pgResult, i);
schemaRow["IsLong"] = false;
schemaRow["IsReadOnly"] = false;
schemaRow.AcceptChanges();
- dataTableSchema.Rows.Add (schemaRow);
+ dataTableSchema.Rows.Add (schemaRow);
}
-
+
#if DEBUG_SqlCommand
Console.WriteLine("********** DEBUG Table Schema BEGIN ************");
foreach (DataRow myRow in dataTableSchema.Rows) {\r
}
}
+
+ // TODO: how do we get the key info if
+ // we don't have the tableName?
+ private void GetKeyInfo(string columnName, out bool isUnique, out bool isKey) {
+ isUnique = false;
+ isKey = false;
+
+ string sql;
+
+ sql =
+ "SELECT i.indkey, i.indisprimary, i.indisunique " +
+ "FROM pg_class c, pg_class c2, pg_index i " +
+ "WHERE c.relname = ':tableName' AND c.oid = i.indrelid " +
+ "AND i.indexrelid = c2.oid ";
+ }
}
}
private void CloseDataSource () {
// FIXME: just a quick hack
if(conState == ConnectionState.Open) {
+ if(trans != null)
+ if(trans.DoingTransaction == true) {
+ trans.Rollback();
+ // trans.Dispose();
+ trans = null;
+ }
+
conState = ConnectionState.Closed;
PostgresLibrary.PQfinish (pgConn);
pgConn = IntPtr.Zero;
public object this[DataColumn column] {
get { return this[column, DataRowVersion.Current]; }
set {
+ bool objIsDBNull = value.Equals(DBNull.Value);
if (column == null)
throw new ArgumentNullException ();
int columnIndex = table.Columns.IndexOf (column);
if (columnIndex == -1)
throw new ArgumentException ();
- if (column.DataType != value.GetType ())
- throw new InvalidCastException ();
+ if(column.DataType != value.GetType ())
+ if(objIsDBNull == true && column.AllowDBNull == false)
+ throw new InvalidCastException ();
if (rowState == DataRowState.Deleted)
throw new DeletedRowInaccessibleException ();
BeginEdit (); // implicitly called
- proposed[columnIndex] = value;
+ if(objIsDBNull)
+ proposed[columnIndex] = DBNull.Value;
+ else
+ proposed[columnIndex] = value;
EndEdit (); // is this the right thing to do?
}
}
projects / mono.git / commitdiff