From: Michael D. <mik...@us...> - 2004-05-19 04:14:30
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Dialect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28396 Modified Files: Dialect.cs GenericDialect.cs HSQLDialect.cs InterbaseDialect.cs PostgreSQLDialect.cs SAPDBDialect.cs SybaseDialect.cs Removed Files: TypeNames.cs Log Message: removed code dealing with type-names. Index: PostgreSQLDialect.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Dialect/PostgreSQLDialect.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PostgreSQLDialect.cs 18 Apr 2003 13:18:35 -0000 1.4 --- PostgreSQLDialect.cs 19 May 2004 04:14:18 -0000 1.5 *************** *** 30,48 **** */ - Register( DbType.Boolean, "BOOL" ); - Register( DbType.Int64, "INT8" ); - Register( DbType.Int16, "INT2" ); - Register( DbType.Int32, "INT4" ); - Register( DbType.AnsiStringFixedLength, "CHAR(1)" ); - Register( DbType.AnsiString, "VARCHAR($l)" ); - Register( DbType.Single, "FLOAT4" ); - Register( DbType.Double, "FLOAT8" ); - Register( DbType.DateTime, "DATE" ); - Register( DbType.Time, "TIMESTAMP" ); - Register( DbType.Binary, "BYTEA" ); - Register( DbType.AnsiString, "TEXT" ); - //Register( DbType.Image, "BYTEA" ); - Register( DbType.Decimal, "NUMERIC" ); - /* getDefaultProperties().setProperty(Environment.OUTER_JOIN, "true"); --- 30,33 ---- Index: InterbaseDialect.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Dialect/InterbaseDialect.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** InterbaseDialect.cs 26 Feb 2003 20:41:58 -0000 1.3 --- InterbaseDialect.cs 19 May 2004 04:14:18 -0000 1.4 *************** *** 30,50 **** Types.CLOB, "BLOB SUB_TYPE 1" ); */ - - Register( DbType.Bit, "SMALLINT" ); - Register( DbType.BigInt, "NUMERIC(18,0)" ); - Register( DbType.SmallInt, "SMALLINT" ); - Register( DbType.TinyInt, "SMALLINT" ); - Register( DbType.Int, "INTEGER" ); - Register( DbType.Char, "CHAR(1)" ); - Register( DbType.VarChar, "VARCHAR($l)" ); - Register( DbType.Float, "FLOAT" ); - Register( DbType.Real, "DOUBLE PRECISION" ); - // Register( DbType.DATE, "DATE" ); ??? - // Register( DbType.TIME, "TIME" ); ??? - Register( DbType.Timestamp, "TIMESTAMP" ); - Register( DbType.VarBinary, "BLOB" ); - Register( DbType.Decimal, "NUMERIC(18, $l)" ); - Register( DbType.Image, "BLOB" ); - Register( DbType.Text, "BLOB SUB_TYPE 1" ); /* --- 30,33 ---- Index: SAPDBDialect.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Dialect/SAPDBDialect.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SAPDBDialect.cs 19 Feb 2003 16:33:17 -0000 1.1 --- SAPDBDialect.cs 19 May 2004 04:14:18 -0000 1.2 *************** *** 34,54 **** Types.BLOB, "LONG BYTE" ); */ - - Register( SqlDbType.Bit, "BOOLEAN" ); - Register( SqlDbType.BigInt, "FIXED(19,0)" ); - Register( SqlDbType.SmallInt, "SMALLINT" ); - Register( SqlDbType.TinyInt, "FIXED(3,0)" ); - Register( SqlDbType.Int, "INT" ); - Register( SqlDbType.Char, "CHAR(1)" ); - Register( SqlDbType.VarChar, "VARCHAR($l)" ); - Register( SqlDbType.Float, "FLOAT" ); - Register( SqlDbType.Real, "DOUBLE PRECISION" ); - //Register( SqlDbType.DATE, "DATE" ); ??? - //Register( SqlDbType.TIME, "TIME" ); ??? - Register( SqlDbType.Timestamp, "TIMESTAMP" ); - Register( SqlDbType.VarBinary, "LONG BYTE" ); - Register( SqlDbType.Decimal, "FIXED(19,$l)" ); - Register( SqlDbType.Text, "LONG VARCHAR" ); - Register( SqlDbType.Image, "LONG BYTE" ); /* --- 34,37 ---- Index: HSQLDialect.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Dialect/HSQLDialect.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** HSQLDialect.cs 26 Feb 2003 20:41:58 -0000 1.3 --- HSQLDialect.cs 19 May 2004 04:14:18 -0000 1.4 *************** *** 32,54 **** Types.NUMERIC, "NUMERIC" ); */ - - Register( DbType.BigInt, "BIGINT" ); - Register( DbType.Binary, "BINARY" ); - Register( DbType.Bit, "BIT" ); - Register( DbType.Char, "CHAR(1)" ); - Register( DbType.DateTime, "DATE" ); //??? - Register( DbType.Decimal, "DECIMAL" ); - Register( DbType.Real, "DOUBLE" ); - Register( DbType.Float, "FLOAT" ); - Register( DbType.Int, "INTEGER" ); - // Register( DbType.LONGVARBINARY, "LONGVARBINARY" ); ??? - Register( DbType.NVarChar, "LONGVARCHAR" ); - Register( DbType.SmallInt, "SMALLINT" ); - Register( DbType.TinyInt, "TINYINT" ); - // Register( DbType.TIME, "TIME" ); ??? - Register( DbType.Timestamp, "TIMESTAMP" ); - Register( DbType.VarChar, "VARCHAR($l)" ); - Register( DbType.VarBinary, "VARBINARY($l)" ); - Register( DbType.Decimal, "NUMERIC" ); /* --- 32,35 ---- Index: SybaseDialect.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Dialect/SybaseDialect.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SybaseDialect.cs 16 Mar 2004 14:17:30 -0000 1.7 --- SybaseDialect.cs 19 May 2004 04:14:18 -0000 1.8 *************** *** 30,50 **** Types.CLOB, "TEXT" ); */ - - Register( DbType.Boolean, "TINYINT" ); //Sybase BIT type does not support null values - Register( DbType.Int64, "NUMERIC(19,0)" ); - Register( DbType.Int16, "SMALLINT" ); - Register( DbType.Int32, "INT" ); - Register( DbType.Byte, "TINYINT" ); - //Register( DbType.Character, "CHAR(1)" ); - Register( DbType.String, "VARCHAR($1)" ); - Register( DbType.Single, "FLOAT" ); - Register( DbType.Double, "DOUBLE PRECISION" ); - Register( DbType.Date, "DATETIME"); - Register( DbType.DateTime, "DATETIME" ); - //Register( DbType.Timestamp, "DATETIME" ); - //Register( DbType.VarBinary, "VARBINARY($1)" ); - Register( DbType.Decimal, "NUMERIC(19,$1)" ); - Register( DbType.Binary, "IMAGE" ); - Register( DbType.AnsiString, "TEXT" ); /* --- 30,33 ---- Index: Dialect.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Dialect/Dialect.cs,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** Dialect.cs 18 May 2004 05:01:02 -0000 1.30 --- Dialect.cs 19 May 2004 04:14:18 -0000 1.31 *************** *** 46,50 **** } - private TypeNames typeNames = new TypeNames("$1"); private IDictionary properties = new Hashtable(); --- 46,49 ---- *************** *** 56,106 **** /// <summary> - /// Get the name of the database type associated with the given typecode - /// </summary> - /// <param name="code">The typecode</param> - /// <returns>The database type name</returns> - public string GetTypeName(DbType code) { - string result = typeNames.Get(code); - if (result == null) - throw new HibernateException("No default type mapping for " + code); - return result; - } - - /// <summary> - /// Get the name of the database type associated with the given typecode - /// </summary> - /// <param name="code">The typecode</param> - /// <param name="length">the length of the column</param> - /// <returns>the database type name</returns> - public string GetTypeName(DbType code, int length) { - string result = typeNames.Get(code, length); - if (result == null) - throw new HibernateException("No type mapping for " + code + " of length " + length); - return result; - } - - /// <summary> - /// Subclasses register a typename for the given type code and maximum - /// column length. <c>$1</c> in the type name will be replaced by the column - /// length (if appropriate - /// </summary> - /// <param name="code">The typecode</param> - /// <param name="capacity">Maximum length of database type</param> - /// <param name="name">The database type name</param> - protected void Register(DbType code, int capacity, string name) { - typeNames.Put(code, capacity, name); - } - - /// <summary> - /// Suclasses register a typename for the given type code. <c>$1</c> in the - /// typename will be replaced by the column length (if appropriate). - /// </summary> - /// <param name="code">The typecode</param> - /// <param name="name">The database type name</param> - protected void Register(DbType code, string name) { - typeNames.Put(code, name); - } - - /// <summary> /// Does this dialect support the <c>ALTER TABLE</c> syntax? /// </summary> --- 55,58 ---- Index: GenericDialect.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Dialect/GenericDialect.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** GenericDialect.cs 12 Apr 2004 05:37:32 -0000 1.7 --- GenericDialect.cs 19 May 2004 04:14:18 -0000 1.8 *************** *** 12,25 **** public GenericDialect() : base() { - // Register( DbType.Boolean, "BIT" ); - // Register( DbType.Int16, "SMALLINT" ); - // Register( DbType.Int32, "INTEGER" ); - // Register( DbType.Int64, "BIGINT" ); - // Register( DbType.String, "VARCHAR($1)" ); - // Register( DbType.Single, "FLOAT" ); - // Register( DbType.DateTime, "DATETIME" ); - // Register( DbType.Time, "TIMESTAMP" ); - // Register( DbType.Binary, "VARBINARY($1)" ); - // Register( DbType.Decimal, "DECIMAL" ); } --- 12,15 ---- --- TypeNames.cs DELETED --- |