Revert changes in GXDataCommon.cs made by mistake.

Author: claudiamurialdo

dotnet/src/dotnetframework/GxClasses/Data/GXDataCommon.cs

@@ -68,8 +68,7 @@ public enum GXType
 		Geopoint=26,
 		Geoline=27,
 		Geopolygon=28,
-		DateAsChar=29,
-		Embedding = 30
+		DateAsChar=29
 	}
 
 	public interface IGxDataRecord
@@ -142,9 +141,6 @@ IDataReader GetDataReader(IGxConnectionManager connManager, IGxConnection connec
 		void SetCursorDef(CursorDef cursorDef);
 		string ConcatOp(int pos);
 		string AfterCreateCommand(string stmt, GxParameterCollection parmBinds);
-#if NETCORE
-		GxEmbedding GetEmbedding(IGxDbCommand gxDbCommand, IDataReader dR, int v, string model, int dimensions);
-#endif
 		int MaxNumberOfValuesInList { get; }
 	}
 
@@ -426,9 +422,9 @@ public virtual void SetParameter(IDbDataParameter parameter, Object value)
 		}
 		protected object CheckDataLength(object value, IDbDataParameter parameter)
 		{
-			if (m_avoidDataTruncationError &&  (parameter.DbType == DbType.String || parameter.DbType == DbType.StringFixedLength) && value is string)
+			if (m_avoidDataTruncationError)
 			{
-				string svalue = value as string;
+				string svalue = value.ToString();
 				if (svalue != null && svalue.Length > parameter.Size)
 				{
 					return svalue.Substring(0, parameter.Size);
@@ -626,15 +622,8 @@ public virtual Guid GetGuid(IGxDbCommand cmd, IDataRecord DR, int i)
         public virtual IGeographicNative GetGeospatial(IGxDbCommand cmd, IDataRecord DR, int i)
         {
 			throw (new GxNotImplementedException());
-		}
-#if NETCORE
-		public virtual GxEmbedding GetEmbedding(IGxDbCommand cmd, IDataReader DR, int i, string model, int dimensions)
-		{
-			throw (new GxNotImplementedException());
-		}
-#endif
-
-		public virtual decimal GetDecimal(IGxDbCommand cmd, IDataRecord DR, int i)
+        }
+        public virtual decimal GetDecimal(IGxDbCommand cmd, IDataRecord DR, int i)
 		{
 			if ( !cmd.HasMoreRows || DR == null || DR.IsDBNull( i))
 				return 0;
@@ -840,7 +829,7 @@ public virtual IDbCommand GetCommand(IGxConnection con, string stmt, GxParameter
 								}
 								catch (Exception ex)
 								{
-									GXLogging.Error(log, "Set Binary parameter length in cached command error", ex.Message, ex);
+									GXLogging.Error(log, "Set Binary parameter length in cached command error", ex);
 								}
 							}
 						}
@@ -1170,10 +1159,6 @@ public virtual string AfterCreateCommand(string stmt, GxParameterCollection parm
 			return stmt;
 		}
 
-		internal virtual DateTime NormalizeDbmsDateTime(DateTime d)
-		{
-			return d;
-		}
 	}
 
 	public class DbDataAdapterElem
@@ -1611,8 +1596,6 @@ public class GxSqlServer : GxDataRecord
 		private const int MILLISECONDS_BETWEEN_RETRY_ATTEMPTS = 500;
 		private const string MULTIPLE_DATAREADERS = "MultipleActiveResultSets";
 #if NETCORE
-		private const string TRUST_SERVER_CERTIFICATE = "TrustServerCertificate";
-		private const bool TRUST_CERT_DEFAULT = true;
 		private const string INTEGRATED_SECURITY = "Integrated Security";
 		private const string INTEGRATED_SECURITY_NO = "no";
 #endif
@@ -1980,7 +1963,7 @@ public override void GetValues(IDataReader reader, ref object[] values)
 			}
 			catch (Exception ex)
 			{
-				GXLogging.Error(log, "GetValues error", ex.Message, ex);
+				GXLogging.Error(log, "GetValues error", ex);
 			}
 		}
 		static internal decimal ReadSQLDecimal(SqlDataReader sqlReader, int idx) {
@@ -2079,14 +2062,6 @@ protected override string BuildConnectionString(string datasourceName, string us
 				connectionString.AppendFormat(";Password={0}", userPassword);
 			}
 			extra = ResolveConnectionStringAuthentication(extra, additionalConnectionString);
-
-			string tSrvCertificate = GetParameterValue(extra, TRUST_SERVER_CERTIFICATE);
-			if (string.IsNullOrEmpty(tSrvCertificate))
-			{
-				//TODO:Remove Temporary compatibility setting to bypass certificate validation
-				connectionString.AppendFormat(";{0}={1}", TRUST_SERVER_CERTIFICATE, TRUST_CERT_DEFAULT); 
-			}
-
 #else
 			if (userId!=null)
 			{
@@ -2289,7 +2264,7 @@ public bool Read()
 			}
 			catch (Exception ex)
 			{
-				GXLogging.Error(log, "ReadError", ex.Message, ex);
+				GXLogging.Error(log, "ReadError", ex);
 				throw (new GxADODataException(ex));
 			}
 		}
@@ -2562,7 +2537,7 @@ public object this[int i]
 		}
 		public int GetValues(object[] values)
 		{
-			return reader.GetValues(values);
+			throw (new GxNotImplementedException());
 		}
 		public int GetOrdinal(string name)
 		{
@@ -3190,7 +3165,7 @@ public void unprepare(int cursorId )
 			}
 			catch (Exception e)
 			{
-				GXLogging.Error(log, "GxCommand.unprepare Error ", e.Message, e);
+				GXLogging.Error(log, "GxCommand.unprepare Error ", e);
 			}
 		}
 		public void UnprepareClear()
@@ -3352,7 +3327,7 @@ public void LoadBlock()
             {
 				if (reader != null) reader.Close();
                 GXLogging.Error(log, "stmt:" + this.stmt);
-                GXLogging.Error(log, "LoadBlock error ", e.Message, e);
+                GXLogging.Error(log, "LoadBlock error ", e);
 
                 Dispose();
                 hasnext = false;
@@ -4284,7 +4259,6 @@ public abstract class GxAbstractConnectionWrapper : IDbConnection
 		protected IDbTransaction m_transaction;
 		protected GxConnectionCache m_connectionCache;
 		protected IsolationLevel m_isolationLevel;
-		const string DISTANCE_FUNCTION = "DISTANCE";
 
 		protected GxAbstractConnectionWrapper(IDbConnection conn, IsolationLevel isolationLevel) :this(conn)
 		{
@@ -4364,8 +4338,6 @@ public ConnectionState State
 			get {	return InternalConnection.State;	}
 		}
 
-		internal virtual string DistanceFunction { get { return DISTANCE_FUNCTION; } }
-
 		public virtual void Open()
 		{
 			InternalConnection.Open();