[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects DerbyDialectExt.java,
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
Menu
▾
▴
[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects DerbyDialectExt.java, 1.2, 1.3 MAXDBDialectExt.java, 1.4, 1.5 McKoiDialectExt.java, 1.3, 1.4 PostgreSQLDialectExt.java, 1.2, 1.3 InformixDialectExt.java, 1.3, 1.4 DB2DialectExt.java, 1.3, 1.4 ProgressDialectExt.java, 1.1, 1.2 PointbaseDialectExt.java, 1.3, 1.4 FirebirdDialectExt.java, 1.3, 1.4 InterbaseDialectExt.java, 1.2, 1.3 DialectUtils.java, 1.45, 1.46 HADBDialectExt.java, 1.3, 1.4 TimesTenDialectExt.java, 1.2, 1.3 SQLServerDialectExt.java, 1.3, 1.4 DaffodilDialectExt.java, 1.3, 1.4 HSQLDialectExt.java, 1.4, 1.5 FrontBaseDialectExt.java, 1.2, 1.3 OracleDialectExt.java, 1.2, 1.3 CommonHibernateDialect.java, 1.6, 1.7 HibernateDialect.java, 1.29, 1.30 SybaseDialectExt.java, 1.2, 1.3 AxionDialectExt.java, 1.2, 1.3 IngresDialectExt.java, 1.2, 1.3
Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv12680/fw/src/net/sourceforge/squirrel_sql/fw/dialects Modified Files: DerbyDialectExt.java MAXDBDialectExt.java McKoiDialectExt.java PostgreSQLDialectExt.java InformixDialectExt.java DB2DialectExt.java ProgressDialectExt.java PointbaseDialectExt.java FirebirdDialectExt.java InterbaseDialectExt.java DialectUtils.java HADBDialectExt.java TimesTenDialectExt.java SQLServerDialectExt.java DaffodilDialectExt.java HSQLDialectExt.java FrontBaseDialectExt.java OracleDialectExt.java CommonHibernateDialect.java HibernateDialect.java SybaseDialectExt.java AxionDialectExt.java IngresDialectExt.java Log Message: Implemented qualifier prefs for DropColumn refactoring. Index: PostgreSQLDialectExt.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/PostgreSQLDialectExt.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PostgreSQLDialectExt.java 9 Mar 2008 23:57:53 -0000 1.2 --- PostgreSQLDialectExt.java 17 Mar 2008 09:42:48 -0000 1.3 *************** *** 274,280 **** * if the database doesn't support dropping columns. */ ! public String getColumnDropSQL(String tableName, String columnName) { ! return DialectUtils.getColumnDropSQL(tableName, columnName); } --- 274,280 ---- * if the database doesn't support dropping columns. */ ! public String getColumnDropSQL(String tableName, String columnName, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! return DialectUtils.getColumnDropSQL(tableName, columnName, qualifier, prefs, this); } Index: HSQLDialectExt.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/HSQLDialectExt.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** HSQLDialectExt.java 9 Mar 2008 23:57:53 -0000 1.4 --- HSQLDialectExt.java 17 Mar 2008 09:42:48 -0000 1.5 *************** *** 146,155 **** /** * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getColumnDropSQL(java.lang.String, ! * java.lang.String) */ @Override ! public String getColumnDropSQL(String tableName, String columnName) { ! return DialectUtils.getColumnDropSQL(tableName, columnName); } --- 146,155 ---- /** * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getColumnDropSQL(java.lang.String, ! * java.lang.String, DatabaseObjectQualifier, SqlGenerationPreferences) */ @Override ! public String getColumnDropSQL(String tableName, String columnName, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! return DialectUtils.getColumnDropSQL(tableName, columnName, qualifier, prefs, this); } Index: SybaseDialectExt.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/SybaseDialectExt.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SybaseDialectExt.java 9 Mar 2008 23:57:53 -0000 1.2 --- SybaseDialectExt.java 17 Mar 2008 09:42:48 -0000 1.3 *************** *** 182,188 **** */ @Override ! public String getColumnDropSQL(String tableName, String columnName) { ! return DialectUtils.getColumnDropSQL(tableName, columnName); } --- 182,188 ---- */ @Override ! public String getColumnDropSQL(String tableName, String columnName, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! return DialectUtils.getColumnDropSQL(tableName, columnName, qualifier, prefs, this); } Index: DB2DialectExt.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/DB2DialectExt.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DB2DialectExt.java 10 Mar 2008 02:03:43 -0000 1.3 --- DB2DialectExt.java 17 Mar 2008 09:42:48 -0000 1.4 *************** *** 329,341 **** * if the database doesn't support dropping columns. */ ! public String getColumnDropSQL(String tableName, String columnName) { // alter table <tablename> drop column <columnName> ! StringBuilder result = new StringBuilder(); ! result.append("ALTER TABLE "); ! result.append(tableName); ! result.append(" DROP COLUMN "); ! result.append(columnName); ! return result.toString(); } --- 329,336 ---- * if the database doesn't support dropping columns. */ ! public String getColumnDropSQL(String tableName, String columnName, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { // alter table <tablename> drop column <columnName> ! return DialectUtils.getColumnDropSQL(tableName, columnName, qualifier, prefs, this); } Index: IngresDialectExt.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/IngresDialectExt.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** IngresDialectExt.java 9 Mar 2008 23:57:53 -0000 1.2 --- IngresDialectExt.java 17 Mar 2008 09:42:48 -0000 1.3 *************** *** 170,176 **** /** * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getColumnDropSQL(java.lang.String, ! * java.lang.String) */ ! public String getColumnDropSQL(String tableName, String columnName) { String dropClause = DialectUtils.DROP_COLUMN_CLAUSE; --- 170,177 ---- /** * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getColumnDropSQL(java.lang.String, ! * java.lang.String, DatabaseObjectQualifier, SqlGenerationPreferences) */ ! public String getColumnDropSQL(String tableName, String columnName, DatabaseObjectQualifier qualifier, ! SqlGenerationPreferences prefs) { String dropClause = DialectUtils.DROP_COLUMN_CLAUSE; *************** *** 178,182 **** String constraintClause = "CASCADE"; ! return DialectUtils.getColumnDropSQL(tableName, columnName, dropClause, true, constraintClause); } --- 179,190 ---- String constraintClause = "CASCADE"; ! return DialectUtils.getColumnDropSQL(tableName, ! columnName, ! dropClause, ! true, ! constraintClause, ! qualifier, ! prefs, ! this); } *************** *** 264,270 **** /** * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getColumnNameAlterSQL(net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo, ! * net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo, DatabaseObjectQualifier, SqlGenerationPreferences) */ ! public String getColumnNameAlterSQL(TableColumnInfo from, TableColumnInfo to, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { int featureId = DialectUtils.COLUMN_NAME_ALTER_TYPE; --- 272,280 ---- /** * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getColumnNameAlterSQL(net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo, ! * net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo, DatabaseObjectQualifier, ! * SqlGenerationPreferences) */ ! public String getColumnNameAlterSQL(TableColumnInfo from, TableColumnInfo to, ! DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { int featureId = DialectUtils.COLUMN_NAME_ALTER_TYPE; *************** *** 314,318 **** * @return SQL to make the change */ ! public String getColumnDefaultAlterSQL(TableColumnInfo info, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { String alterClause = DialectUtils.ALTER_COLUMN_CLAUSE; --- 324,329 ---- * @return SQL to make the change */ ! public String getColumnDefaultAlterSQL(TableColumnInfo info, DatabaseObjectQualifier qualifier, ! SqlGenerationPreferences prefs) { String alterClause = DialectUtils.ALTER_COLUMN_CLAUSE; Index: InterbaseDialectExt.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/InterbaseDialectExt.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** InterbaseDialectExt.java 9 Mar 2008 23:57:53 -0000 1.2 --- InterbaseDialectExt.java 17 Mar 2008 09:42:48 -0000 1.3 *************** *** 253,260 **** */ @Override ! public String getColumnDropSQL(String tableName, String columnName) { // TODO: Need to verify this ! return DialectUtils.getColumnDropSQL(tableName, columnName); } --- 253,260 ---- */ @Override ! public String getColumnDropSQL(String tableName, String columnName, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { // TODO: Need to verify this ! return DialectUtils.getColumnDropSQL(tableName, columnName, qualifier, prefs, this); } Index: MAXDBDialectExt.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/MAXDBDialectExt.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MAXDBDialectExt.java 9 Mar 2008 23:57:53 -0000 1.4 --- MAXDBDialectExt.java 17 Mar 2008 09:42:48 -0000 1.5 *************** *** 196,202 **** */ @Override ! public String getColumnDropSQL(final String tableName, final String columnName) { ! return DialectUtils.getColumnDropSQL(tableName, columnName); } --- 196,202 ---- */ @Override ! public String getColumnDropSQL(final String tableName, final String columnName, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! return DialectUtils.getColumnDropSQL(tableName, columnName, qualifier, prefs, this); } Index: PointbaseDialectExt.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/PointbaseDialectExt.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PointbaseDialectExt.java 12 Mar 2008 01:07:31 -0000 1.3 --- PointbaseDialectExt.java 17 Mar 2008 09:42:48 -0000 1.4 *************** *** 241,247 **** */ @Override ! public String getColumnDropSQL(final String tableName, final String columnName) { ! return DialectUtils.getColumnDropSQL(tableName, columnName); } --- 241,247 ---- */ @Override ! public String getColumnDropSQL(final String tableName, final String columnName, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! return DialectUtils.getColumnDropSQL(tableName, columnName, qualifier, prefs, this); } Index: ProgressDialectExt.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/ProgressDialectExt.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ProgressDialectExt.java 9 Mar 2008 23:57:53 -0000 1.1 --- ProgressDialectExt.java 17 Mar 2008 09:42:48 -0000 1.2 *************** *** 233,242 **** /** * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getColumnDropSQL(java.lang.String, ! * java.lang.String) */ @Override ! public String getColumnDropSQL(final String tableName, final String columnName) { ! return DialectUtils.getColumnDropSQL(tableName, columnName); } --- 233,242 ---- /** * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getColumnDropSQL(java.lang.String, ! * java.lang.String, DatabaseObjectQualifier, SqlGenerationPreferences) */ @Override ! public String getColumnDropSQL(final String tableName, final String columnName, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! return DialectUtils.getColumnDropSQL(tableName, columnName, qualifier, prefs, this); } Index: OracleDialectExt.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/OracleDialectExt.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OracleDialectExt.java 9 Mar 2008 23:57:53 -0000 1.2 --- OracleDialectExt.java 17 Mar 2008 09:42:48 -0000 1.3 *************** *** 202,206 **** * if the database doesn't support dropping columns. */ ! public String getColumnDropSQL(String tableName, String columnName) { StringBuffer result = new StringBuffer(); --- 202,206 ---- * if the database doesn't support dropping columns. */ ! public String getColumnDropSQL(String tableName, String columnName, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { StringBuffer result = new StringBuffer(); *************** *** 376,380 **** // drop <columnName> ! String dropSQL = getColumnDropSQL(from.getTableName(), from.getColumnName()); result.add(dropSQL); --- 376,380 ---- // drop <columnName> ! String dropSQL = getColumnDropSQL(from.getTableName(), from.getColumnName(), qualifier, prefs); result.add(dropSQL); Index: InformixDialectExt.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/InformixDialectExt.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** InformixDialectExt.java 9 Mar 2008 23:57:53 -0000 1.3 --- InformixDialectExt.java 17 Mar 2008 09:42:48 -0000 1.4 *************** *** 196,202 **** * if the database doesn't support dropping columns. */ ! public String getColumnDropSQL(String tableName, String columnName) { ! return DialectUtils.getColumnDropSQL(tableName, columnName); } --- 196,202 ---- * if the database doesn't support dropping columns. */ ! public String getColumnDropSQL(String tableName, String columnName, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! return DialectUtils.getColumnDropSQL(tableName, columnName, qualifier, prefs, this); } Index: TimesTenDialectExt.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/TimesTenDialectExt.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TimesTenDialectExt.java 9 Mar 2008 23:57:53 -0000 1.2 --- TimesTenDialectExt.java 17 Mar 2008 09:42:48 -0000 1.3 *************** *** 203,209 **** * if the database doesn't support dropping columns. */ ! public String getColumnDropSQL(String tableName, String columnName) { ! return DialectUtils.getColumnDropSQL(tableName, columnName); } --- 203,209 ---- * if the database doesn't support dropping columns. */ ! public String getColumnDropSQL(String tableName, String columnName, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! return DialectUtils.getColumnDropSQL(tableName, columnName, qualifier, prefs, this); } Index: DerbyDialectExt.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/DerbyDialectExt.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DerbyDialectExt.java 9 Mar 2008 23:57:53 -0000 1.2 --- DerbyDialectExt.java 17 Mar 2008 09:42:48 -0000 1.3 *************** *** 226,235 **** /** * @see net.sourceforge.squirrel_sql.fw.dialects.DB2DialectExt#getColumnDropSQL(java.lang.String, ! * java.lang.String) */ @Override ! public String getColumnDropSQL(final String tableName, final String columnName) { ! return DialectUtils.getColumnDropSQL(tableName, columnName); } --- 226,235 ---- /** * @see net.sourceforge.squirrel_sql.fw.dialects.DB2DialectExt#getColumnDropSQL(java.lang.String, ! * java.lang.String, DatabaseObjectQualifier, SqlGenerationPreferences) */ @Override ! public String getColumnDropSQL(final String tableName, final String columnName, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! return DialectUtils.getColumnDropSQL(tableName, columnName, qualifier, prefs, this); } Index: SQLServerDialectExt.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/SQLServerDialectExt.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SQLServerDialectExt.java 9 Mar 2008 23:57:53 -0000 1.3 --- SQLServerDialectExt.java 17 Mar 2008 09:42:48 -0000 1.4 *************** *** 235,241 **** */ @Override ! public String getColumnDropSQL(String tableName, String columnName) { ! return DialectUtils.getColumnDropSQL(tableName, columnName, "DROP COLUMN", false, null); } --- 235,241 ---- */ @Override ! public String getColumnDropSQL(String tableName, String columnName, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! return DialectUtils.getColumnDropSQL(tableName, columnName, "DROP COLUMN", false, null, qualifier, prefs, this); } Index: HADBDialectExt.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/HADBDialectExt.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** HADBDialectExt.java 9 Mar 2008 23:57:53 -0000 1.3 --- HADBDialectExt.java 17 Mar 2008 09:42:48 -0000 1.4 *************** *** 126,130 **** * @throw UnsupportedOperationException if the database doesn't support dropping columns. */ ! public String getColumnDropSQL(String tableName, String columnName) throws UnsupportedOperationException { throw new UnsupportedOperationException("Not yet implemented"); --- 126,130 ---- * @throw UnsupportedOperationException if the database doesn't support dropping columns. */ ! public String getColumnDropSQL(String tableName, String columnName, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) throws UnsupportedOperationException { throw new UnsupportedOperationException("Not yet implemented"); Index: FrontBaseDialectExt.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/FrontBaseDialectExt.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FrontBaseDialectExt.java 9 Mar 2008 23:57:53 -0000 1.2 --- FrontBaseDialectExt.java 17 Mar 2008 09:42:48 -0000 1.3 *************** *** 237,244 **** * if the database doesn't support dropping columns. */ ! public String getColumnDropSQL(String tableName, String columnName) { String dropClause = DialectUtils.DROP_COLUMN_CLAUSE; ! return DialectUtils.getColumnDropSQL(tableName, columnName, dropClause, true, "CASCADE"); } --- 237,244 ---- * if the database doesn't support dropping columns. */ ! public String getColumnDropSQL(String tableName, String columnName, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { String dropClause = DialectUtils.DROP_COLUMN_CLAUSE; ! return DialectUtils.getColumnDropSQL(tableName, columnName, dropClause, true, "CASCADE", qualifier, prefs, this); } Index: FirebirdDialectExt.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/FirebirdDialectExt.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FirebirdDialectExt.java 9 Mar 2008 23:57:53 -0000 1.3 --- FirebirdDialectExt.java 17 Mar 2008 09:42:48 -0000 1.4 *************** *** 175,184 **** /** * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getColumnDropSQL(java.lang.String, ! * java.lang.String) */ @Override ! public String getColumnDropSQL(String tableName, String columnName) { ! return DialectUtils.getColumnDropSQL(tableName, columnName); } --- 175,184 ---- /** * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getColumnDropSQL(java.lang.String, ! * java.lang.String, DatabaseObjectQualifier, SqlGenerationPreferences) */ @Override ! public String getColumnDropSQL(String tableName, String columnName, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! return DialectUtils.getColumnDropSQL(tableName, columnName, qualifier, prefs, this); } Index: CommonHibernateDialect.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/CommonHibernateDialect.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CommonHibernateDialect.java 13 Mar 2008 02:14:06 -0000 1.6 --- CommonHibernateDialect.java 17 Mar 2008 09:42:48 -0000 1.7 *************** *** 60,65 **** SqlGenerationPreferences prefs) { ! // TODO Auto-generated method stub ! return null; } --- 60,66 ---- SqlGenerationPreferences prefs) { ! final int featureId = DialectUtils.ADD_AUTO_INCREMENT_TYPE; ! final String msg = DialectUtils.getUnsupportedMessage(this, featureId); ! throw new UnsupportedOperationException(msg); } *************** *** 108,113 **** String onDeleteAction, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! // TODO Auto-generated method stub ! return null; } --- 109,115 ---- String onDeleteAction, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! final int featureId = DialectUtils.ADD_FOREIGN_KEY_TYPE; ! final String msg = DialectUtils.getUnsupportedMessage(this, featureId); ! throw new UnsupportedOperationException(msg); } *************** *** 131,136 **** TableColumnInfo[] columns, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! // TODO Auto-generated method stub ! return null; } --- 133,139 ---- TableColumnInfo[] columns, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! final int featureId = DialectUtils.ADD_UNIQUE_TYPE; ! final String msg = DialectUtils.getUnsupportedMessage(this, featureId); ! throw new UnsupportedOperationException(msg); } *************** *** 151,189 **** /** ! * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getColumnCommentAlterSQL(net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo, DatabaseObjectQualifier, SqlGenerationPreferences) */ ! public String getColumnCommentAlterSQL(TableColumnInfo info, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) throws UnsupportedOperationException { ! // TODO Auto-generated method stub ! return null; } /** ! * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getColumnDefaultAlterSQL(net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo, DatabaseObjectQualifier, SqlGenerationPreferences) */ ! public String getColumnDefaultAlterSQL(TableColumnInfo info, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! // TODO Auto-generated method stub ! return null; } /** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getColumnDropSQL(java.lang.String, ! * java.lang.String) */ ! public String getColumnDropSQL(String tableName, String columnName) throws UnsupportedOperationException { StringTemplate st = new StringTemplate(DROP_COLUMN_SQL_TEMPLATE); ! // TODO: implement this when qualifier and prefs are being passed in. ! // HashMap<String, String> valuesMap = ! // DialectUtils.getValuesMap(ST_TABLE_NAME_KEY, tableName, ST_COLUMN_NAME_KEY, columnName); ! // ! // DialectUtils.bindTemplateAttributes(this, st, valuesMap, qualifier, prefs) ! ! st.setAttribute(ST_TABLE_NAME_KEY, tableName); ! st.setAttribute(ST_COLUMN_NAME_KEY, columnName); ! ! return st.toString(); } --- 154,192 ---- /** ! * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getColumnCommentAlterSQL(net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo, ! * DatabaseObjectQualifier, SqlGenerationPreferences) */ ! public String getColumnCommentAlterSQL(TableColumnInfo info, DatabaseObjectQualifier qualifier, ! SqlGenerationPreferences prefs) throws UnsupportedOperationException { ! final int featureId = DialectUtils.COLUMN_COMMENT_ALTER_TYPE; ! final String msg = DialectUtils.getUnsupportedMessage(this, featureId); ! throw new UnsupportedOperationException(msg); } /** ! * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getColumnDefaultAlterSQL(net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo, ! * DatabaseObjectQualifier, SqlGenerationPreferences) */ ! public String getColumnDefaultAlterSQL(TableColumnInfo info, DatabaseObjectQualifier qualifier, ! SqlGenerationPreferences prefs) { ! final int featureId = DialectUtils.COLUMN_DEFAULT_ALTER_TYPE; ! final String msg = DialectUtils.getUnsupportedMessage(this, featureId); ! throw new UnsupportedOperationException(msg); } /** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getColumnDropSQL(java.lang.String, ! * java.lang.String, DatabaseObjectQualifier, SqlGenerationPreferences) */ ! public String getColumnDropSQL(String tableName, String columnName, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) throws UnsupportedOperationException { StringTemplate st = new StringTemplate(DROP_COLUMN_SQL_TEMPLATE); ! HashMap<String, String> valuesMap = ! DialectUtils.getValuesMap(ST_TABLE_NAME_KEY, tableName, ST_COLUMN_NAME_KEY, columnName); ! ! return DialectUtils.bindTemplateAttributes(this, st, valuesMap, qualifier, prefs); } *************** *** 198,207 **** /** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getColumnNameAlterSQL(net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo, ! * net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo, DatabaseObjectQualifier, SqlGenerationPreferences) */ ! public String getColumnNameAlterSQL(TableColumnInfo from, TableColumnInfo to, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! // TODO Auto-generated method stub ! return null; } --- 201,213 ---- /** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getColumnNameAlterSQL(net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo, ! * net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo, DatabaseObjectQualifier, ! * SqlGenerationPreferences) */ ! public String getColumnNameAlterSQL(TableColumnInfo from, TableColumnInfo to, ! DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! final int featureId = DialectUtils.COLUMN_NAME_ALTER_TYPE; ! final String msg = DialectUtils.getUnsupportedMessage(this, featureId); ! throw new UnsupportedOperationException(msg); } *************** *** 214,219 **** SqlGenerationPreferences prefs) { ! // TODO Auto-generated method stub ! return null; } --- 220,226 ---- SqlGenerationPreferences prefs) { ! final int featureId = DialectUtils.COLUMN_NULL_ALTER_TYPE; ! final String msg = DialectUtils.getUnsupportedMessage(this, featureId); ! throw new UnsupportedOperationException(msg); } *************** *** 227,232 **** DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) throws UnsupportedOperationException { ! // TODO Auto-generated method stub ! return null; } --- 234,240 ---- DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) throws UnsupportedOperationException { ! final int featureId = DialectUtils.COLUMN_TYPE_ALTER_TYPE; ! final String msg = DialectUtils.getUnsupportedMessage(this, featureId); ! throw new UnsupportedOperationException(msg); } *************** *** 241,246 **** SqlGenerationPreferences prefs) { ! // TODO Auto-generated method stub ! return null; } --- 249,255 ---- SqlGenerationPreferences prefs) { ! final int featureId = DialectUtils.CREATE_INDEX_TYPE; ! final String msg = DialectUtils.getUnsupportedMessage(this, featureId); ! throw new UnsupportedOperationException(msg); } *************** *** 255,260 **** SqlGenerationPreferences prefs) { ! // TODO Auto-generated method stub ! return null; } --- 264,270 ---- SqlGenerationPreferences prefs) { ! final int featureId = DialectUtils.CREATE_SEQUENCE_TYPE; ! final String msg = DialectUtils.getUnsupportedMessage(this, featureId); ! throw new UnsupportedOperationException(msg); } *************** *** 290,295 **** DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! // TODO Auto-generated method stub ! return null; } --- 300,306 ---- DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! final int featureId = DialectUtils.CREATE_VIEW_TYPE; ! final String msg = DialectUtils.getUnsupportedMessage(this, featureId); ! throw new UnsupportedOperationException(msg); } *************** *** 299,303 **** public DialectType getDialectType() { - // TODO Auto-generated method stub return DialectType.GENERIC; } --- 310,313 ---- *************** *** 340,350 **** public String getDropIndexSQL(String tableName, String indexName, boolean cascade, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) ! { // "DROP INDEX $indexName$"; ! StringTemplate st = new StringTemplate(ST_DROP_INDEX_STYLE_THREE); ! HashMap<String, String> valuesMap = DialectUtils.getValuesMap(ST_INDEX_NAME_KEY, indexName); ! return DialectUtils.bindTemplateAttributes(this, st, valuesMap, qualifier, prefs); } --- 350,360 ---- public String getDropIndexSQL(String tableName, String indexName, boolean cascade, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) ! { // "DROP INDEX $indexName$"; ! StringTemplate st = new StringTemplate(ST_DROP_INDEX_STYLE_THREE); ! HashMap<String, String> valuesMap = DialectUtils.getValuesMap(ST_INDEX_NAME_KEY, indexName); ! return DialectUtils.bindTemplateAttributes(this, st, valuesMap, qualifier, prefs); } *************** *** 355,360 **** public String getDropPrimaryKeySQL(String pkName, String tableName) { ! // TODO Auto-generated method stub ! return null; } --- 365,371 ---- public String getDropPrimaryKeySQL(String pkName, String tableName) { ! final int featureId = DialectUtils.DROP_PRIMARY_KEY_TYPE; ! final String msg = DialectUtils.getUnsupportedMessage(this, featureId); ! throw new UnsupportedOperationException(msg); } *************** *** 367,373 **** SqlGenerationPreferences prefs) { ! final int featureId = DialectUtils.DROP_SEQUENCE_TYPE; ! final String msg = DialectUtils.getUnsupportedMessage(this, featureId); ! throw new UnsupportedOperationException(msg); } --- 378,384 ---- SqlGenerationPreferences prefs) { ! final int featureId = DialectUtils.DROP_SEQUENCE_TYPE; ! final String msg = DialectUtils.getUnsupportedMessage(this, featureId); ! throw new UnsupportedOperationException(msg); } *************** *** 467,472 **** SqlGenerationPreferences prefs) { ! // TODO Auto-generated method stub ! return null; } --- 478,482 ---- SqlGenerationPreferences prefs) { ! return identifier; } *************** *** 479,484 **** DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! // TODO Auto-generated method stub ! return null; } --- 489,495 ---- DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! final int featureId = DialectUtils.RENAME_TABLE_TYPE; ! final String msg = DialectUtils.getUnsupportedMessage(this, featureId); ! throw new UnsupportedOperationException(msg); } *************** *** 491,497 **** DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! final int featureId = DialectUtils.RENAME_VIEW_TYPE; ! final String msg = DialectUtils.getUnsupportedMessage(this, featureId); ! throw new UnsupportedOperationException(msg); } --- 502,508 ---- DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! final int featureId = DialectUtils.RENAME_VIEW_TYPE; ! final String msg = DialectUtils.getUnsupportedMessage(this, featureId); ! throw new UnsupportedOperationException(msg); } *************** *** 504,509 **** SqlGenerationPreferences prefs) { ! // TODO Auto-generated method stub ! return null; } --- 515,521 ---- SqlGenerationPreferences prefs) { ! final int featureId = DialectUtils.SEQUENCE_INFORMATION_TYPE; ! final String msg = DialectUtils.getUnsupportedMessage(this, featureId); ! throw new UnsupportedOperationException(msg); } *************** *** 583,589 **** SqlGenerationPreferences prefs) { ! final int featureId = DialectUtils.VIEW_DEFINITION_TYPE; ! final String msg = DialectUtils.getUnsupportedMessage(this, featureId); ! throw new UnsupportedOperationException(msg); } --- 595,601 ---- SqlGenerationPreferences prefs) { ! final int featureId = DialectUtils.VIEW_DEFINITION_TYPE; ! final String msg = DialectUtils.getUnsupportedMessage(this, featureId); ! throw new UnsupportedOperationException(msg); } *************** *** 593,597 **** public boolean supportsAccessMethods() { - // TODO Auto-generated method stub return false; } --- 605,608 ---- *************** *** 602,606 **** public boolean supportsAddColumn() { - // TODO Auto-generated method stub return false; } --- 613,616 ---- *************** *** 611,615 **** public boolean supportsAddForeignKeyConstraint() { - // TODO Auto-generated method stub return false; } --- 621,624 ---- *************** *** 620,624 **** public boolean supportsAddUniqueConstraint() { - // TODO Auto-generated method stub return false; } --- 629,632 ---- *************** *** 629,633 **** public boolean supportsAlterColumnDefault() { - // TODO Auto-generated method stub return false; } --- 637,640 ---- *************** *** 638,642 **** public boolean supportsAlterColumnNull() { - // TODO Auto-generated method stub return false; } --- 645,648 ---- *************** *** 655,659 **** public boolean supportsAlterSequence() { - // TODO Auto-generated method stub return false; } --- 661,664 ---- *************** *** 664,668 **** public boolean supportsAutoIncrement() { - // TODO Auto-generated method stub return false; } --- 669,672 ---- *************** *** 673,677 **** public boolean supportsCheckOptionsForViews() { - // TODO Auto-generated method stub return false; } --- 677,680 ---- *************** *** 682,686 **** public boolean supportsColumnComment() { - // TODO Auto-generated method stub return false; } --- 685,688 ---- *************** *** 699,703 **** public boolean supportsCreateIndex() { - // TODO Auto-generated method stub return false; } --- 701,704 ---- *************** *** 708,712 **** public boolean supportsCreateSequence() { - // TODO Auto-generated method stub return false; } --- 709,712 ---- *************** *** 741,745 **** public boolean supportsDropConstraint() { - // TODO Auto-generated method stub return false; } --- 741,744 ---- *************** *** 750,754 **** public boolean supportsDropIndex() { - // TODO Auto-generated method stub return false; } --- 749,752 ---- *************** *** 902,906 **** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getSequencePropertyMutability() */ ! public SequencePropertyMutability getSequencePropertyMutability() { return new SequencePropertyMutability(); } --- 900,905 ---- * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getSequencePropertyMutability() */ ! public SequencePropertyMutability getSequencePropertyMutability() ! { return new SequencePropertyMutability(); } *************** *** 909,913 **** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#supportsSubSecondTimestamps() */ ! public boolean supportsSubSecondTimestamps() { return true; } --- 908,913 ---- * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#supportsSubSecondTimestamps() */ ! public boolean supportsSubSecondTimestamps() ! { return true; } *************** *** 928,932 **** return true; } ! ! } --- 928,931 ---- return true; } ! } Index: AxionDialectExt.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/AxionDialectExt.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AxionDialectExt.java 9 Mar 2008 23:57:53 -0000 1.2 --- AxionDialectExt.java 17 Mar 2008 09:42:48 -0000 1.3 *************** *** 176,182 **** * if the database doesn't support dropping columns. */ ! public String getColumnDropSQL(String tableName, String columnName) { ! return DialectUtils.getColumnDropSQL(tableName, columnName); } --- 176,182 ---- * if the database doesn't support dropping columns. */ ! public String getColumnDropSQL(String tableName, String columnName, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! return DialectUtils.getColumnDropSQL(tableName, columnName, qualifier, prefs, this); } Index: HibernateDialect.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/HibernateDialect.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** HibernateDialect.java 9 Mar 2008 23:57:53 -0000 1.29 --- HibernateDialect.java 17 Mar 2008 09:42:48 -0000 1.30 *************** *** 54,67 **** /** ! * Get the name of the database type associated with the given ! * {@link java.sql.Types} typecode. ! * ! * @param code The {@link java.sql.Types} typecode * @return the database type name ! * @throws HibernateException If no mapping was specified for that type. */ public String getTypeName(int code) throws HibernateException; ! ! /** * Returns a boolean indicating whether or not the specified database object can be pasted into for this --- 54,67 ---- /** ! * Get the name of the database type associated with the given {@link java.sql.Types} typecode. ! * ! * @param code ! * The {@link java.sql.Types} typecode * @return the database type name ! * @throws HibernateException ! * If no mapping was specified for that type. */ public String getTypeName(int code) throws HibernateException; ! /** * Returns a boolean indicating whether or not the specified database object can be pasted into for this *************** *** 193,203 **** * @param info * information about the column such as type, name, etc. ! * @param qualifier TODO ! * @param prefs TODO * @return * @throws UnsupportedOperationException * if the database doesn't support annotating columns with a comment. */ ! public String getColumnCommentAlterSQL(TableColumnInfo info, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) throws UnsupportedOperationException; /** --- 193,206 ---- * @param info * information about the column such as type, name, etc. ! * @param qualifier ! * qualifier of the table ! * @param prefs ! * preferences for generated sql scripts * @return * @throws UnsupportedOperationException * if the database doesn't support annotating columns with a comment. */ ! public String getColumnCommentAlterSQL(TableColumnInfo info, DatabaseObjectQualifier qualifier, ! SqlGenerationPreferences prefs) throws UnsupportedOperationException; /** *************** *** 224,231 **** * @param columnName * the name of the column to drop. ! * @return * @throw UnsupportedOperationException if the database doesn't support dropping columns. */ ! String getColumnDropSQL(String tableName, String columnName) throws UnsupportedOperationException; /** --- 227,239 ---- * @param columnName * the name of the column to drop. ! * @param qualifier ! * qualifier of the table ! * @param prefs ! * preferences for generated sql scripts ! * @return the sql for dropping the specified column * @throw UnsupportedOperationException if the database doesn't support dropping columns. */ ! String getColumnDropSQL(String tableName, String columnName, DatabaseObjectQualifier qualifier, ! SqlGenerationPreferences prefs) throws UnsupportedOperationException; /** *************** *** 293,298 **** * @param to * the TableColumnInfo as it wants to be ! * @param qualifier TODO ! * @param prefs TODO * @return the SQL to make the change */ --- 301,308 ---- * @param to * the TableColumnInfo as it wants to be ! * @param qualifier ! * qualifier of the table ! * @param prefs ! * preferences for generated sql scripts * @return the SQL to make the change */ *************** *** 341,349 **** * @param info * the column to modify and it's default value. ! * @param qualifier TODO ! * @param prefs TODO * @return SQL to make the change */ ! String getColumnDefaultAlterSQL(TableColumnInfo info, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs); /** --- 351,362 ---- * @param info * the column to modify and it's default value. ! * @param qualifier ! * qualifier of the table ! * @param prefs ! * preferences for generated sql scripts * @return SQL to make the change */ ! String getColumnDefaultAlterSQL(TableColumnInfo info, DatabaseObjectQualifier qualifier, ! SqlGenerationPreferences prefs); /** *************** *** 401,405 **** /** * Returns a boolean value indicating whether or not this database dialect suports tablespaces. ! * Specifically, when creating an index, some databases allow a tablespace to be specified to create the * index in, recognizing that indexes can be quite large. * --- 414,418 ---- /** * Returns a boolean value indicating whether or not this database dialect suports tablespaces. ! * Specifically, when creating an index, some databases allow a tablespace to be specified to create the * index in, recognizing that indexes can be quite large. * *************** *** 578,595 **** /** ! * Gets the index access methods that this dialect supports used when creating indexes. * * @return all the access methods supported by this dialect. */ public String[] getIndexAccessMethodsTypes(); - /** ! * Gets the index storage options that this dialect supports used when creating indexes. * * @return all the access methods supported by this dialect. ! */ public String[] getIndexStorageOptions(); ! /** * Gets the SQL command to create a new table. --- 591,607 ---- /** ! * Gets the index access methods that this dialect supports used when creating indexes. * * @return all the access methods supported by this dialect. */ public String[] getIndexAccessMethodsTypes(); /** ! * Gets the index storage options that this dialect supports used when creating indexes. * * @return all the access methods supported by this dialect. ! */ public String[] getIndexStorageOptions(); ! /** * Gets the SQL command to create a new table. *************** *** 934,939 **** * @return the sql command to update data. */ ! public String[] getUpdateSQL(String tableName, String[] setColumns, String[] setValues, String[] fromTables, ! String[] whereColumns, String[] whereValues, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs); --- 946,951 ---- * @return the sql command to update data. */ ! public String[] getUpdateSQL(String tableName, String[] setColumns, String[] setValues, ! String[] fromTables, String[] whereColumns, String[] whereValues, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs); *************** *** 970,974 **** /** ! * Whether or not the definition of a view can be determined via a query that is returned from * getViewDefinitionSQL method * --- 982,986 ---- /** ! * Whether or not the definition of a view can be determined via a query that is returned from * getViewDefinitionSQL method * *************** *** 976,983 **** */ public boolean supportsViewDefinition(); ! /** * Returns the SQL that can be used to query the data dictionary for the body of a view. This should ! * exclude the "CREATE VIEW <viewname> AS" prefix and just return the query. This can return null if the * database doesn't provide access to this definition. * --- 988,995 ---- */ public boolean supportsViewDefinition(); ! /** * Returns the SQL that can be used to query the data dictionary for the body of a view. This should ! * exclude the "CREATE VIEW <viewname> AS" prefix and just return the query. This can return null if the * database doesn't provide access to this definition. * *************** *** 992,1000 **** public String getViewDefinitionSQL(String viewName, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs); ! ! /** * Returns the qualified identifier based on the specified qualifier and user preferences. ! * * @param identifier * @param qualifier --- 1004,1011 ---- public String getViewDefinitionSQL(String viewName, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs); ! /** * Returns the qualified identifier based on the specified qualifier and user preferences. ! * * @param identifier * @param qualifier *************** *** 1005,1009 **** SqlGenerationPreferences prefs); - /** * Returns a boolean indicating whether or not this dialect supports correlated sub-queries. --- 1016,1019 ---- *************** *** 1014,1018 **** /** ! * Gets the sequence property mutability, which describes which properties of a sequence can be changed, * and which cannot. * --- 1024,1028 ---- /** ! * Gets the sequence property mutability, which describes which properties of a sequence can be changed, * and which cannot. * *************** *** 1020,1025 **** */ SequencePropertyMutability getSequencePropertyMutability(); ! ! /** * Returns a boolean indicating whether or not this dialect supports timestamps with fractional second --- 1030,1034 ---- */ SequencePropertyMutability getSequencePropertyMutability(); ! /** * Returns a boolean indicating whether or not this dialect supports timestamps with fractional second *************** *** 1038,1049 **** */ boolean supportsAddPrimaryKey(); ! /** ! * Returns a boolean indicating whether or not this dialect supports generating SQL for dropping primary * keys from existing tables. * * @return true if dropping primary keys is supported; false otherwise. ! */ boolean supportsDropPrimaryKey(); ! } --- 1047,1058 ---- */ boolean supportsAddPrimaryKey(); ! /** ! * Returns a boolean indicating whether or not this dialect supports generating SQL for dropping primary * keys from existing tables. * * @return true if dropping primary keys is supported; false otherwise. ! */ boolean supportsDropPrimaryKey(); ! } Index: DaffodilDialectExt.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/DaffodilDialectExt.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DaffodilDialectExt.java 13 Mar 2008 02:14:06 -0000 1.3 --- DaffodilDialectExt.java 17 Mar 2008 09:42:48 -0000 1.4 *************** *** 196,203 **** /** * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getColumnDropSQL(java.lang.String, ! * java.lang.String) */ @Override ! public String getColumnDropSQL(final String tableName, final String columnName) throws UnsupportedOperationException { --- 196,203 ---- /** * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getColumnDropSQL(java.lang.String, ! * java.lang.String, DatabaseObjectQualifier, SqlGenerationPreferences) */ @Override ! public String getColumnDropSQL(final String tableName, final String columnName, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) throws UnsupportedOperationException { Index: McKoiDialectExt.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/McKoiDialectExt.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** McKoiDialectExt.java 10 Mar 2008 02:03:43 -0000 1.3 --- McKoiDialectExt.java 17 Mar 2008 09:42:48 -0000 1.4 *************** *** 237,243 **** * if the database doesn't support dropping columns. */ ! public String getColumnDropSQL(String tableName, String columnName) { ! return DialectUtils.getColumnDropSQL(tableName, columnName); } --- 237,243 ---- * if the database doesn't support dropping columns. */ ! public String getColumnDropSQL(String tableName, String columnName, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { ! return DialectUtils.getColumnDropSQL(tableName, columnName, qualifier, prefs, this); } Index: DialectUtils.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/DialectUtils.java,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** DialectUtils.java 13 Mar 2008 02:14:06 -0000 1.45 --- DialectUtils.java 17 Mar 2008 09:42:48 -0000 1.46 *************** *** 313,319 **** * * @param qualifier ! * TODO * @param prefs ! * TODO * @param dialect * TODO --- 313,319 ---- * * @param qualifier ! * qualifier of the table * @param prefs ! * preferences for generated sql scripts * @param dialect * TODO *************** *** 338,350 **** * @param tableName * @param columnName * @return */ ! public static String getColumnDropSQL(String tableName, String columnName) { ! return getColumnDropSQL(tableName, columnName, "DROP", false, null); } /** ! * @param tableName * @param columnName * @param addConstraintClause --- 338,356 ---- * @param tableName * @param columnName + * @param qualifier + * qualifier of the table + * @param prefs + * preferences for generated sql scripts + * @param dialect * @return */ ! public static String getColumnDropSQL(String tableName, String columnName, ! DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs, HibernateDialect dialect) { ! return getColumnDropSQL(tableName, columnName, "DROP", false, null, qualifier, prefs, dialect); } /** ! * @param tableName the unqualified table * @param columnName * @param addConstraintClause *************** *** 352,363 **** * @param constraintClause * TODO * @return */ public static String getColumnDropSQL(String tableName, String columnName, String dropClause, ! boolean addConstraintClause, String constraintClause) { StringBuilder result = new StringBuilder(); result.append("ALTER TABLE "); ! result.append(tableName); result.append(" "); result.append(dropClause); --- 358,374 ---- * @param constraintClause * TODO + * @param qualifier + * qualifier of the table + * @param prefs + * preferences for generated sql scripts * @return */ public static String getColumnDropSQL(String tableName, String columnName, String dropClause, ! boolean addConstraintClause, String constraintClause, DatabaseObjectQualifier qualifier, ! SqlGenerationPreferences prefs, HibernateDialect dialect) { StringBuilder result = new StringBuilder(); result.append("ALTER TABLE "); ! result.append(shapeQualifiableIdentifier(tableName, qualifier, prefs, dialect)); result.append(" "); result.append(dropClause); *************** *** 411,414 **** --- 422,430 ---- } + /** + * @param info + * @param dialect + * @return + */ public static String getTypeName(TableColumnInfo info, HibernateDialect dialect) { *************** *** 549,552 **** --- 565,581 ---- } + /** + * @param fkST + * @param fkValuesMap + * @param childIndexST + * @param ckIndexValuesMap + * @param localRefColumns + * @param qualifier + * @param qualifier + * qualifier of the table + * @param prefs + * preferences for generated sql scripts + * @return + */ public static String[] getAddForeignKeyConstraintSQL(StringTemplate fkST, HashMap<String, String> fkValuesMap, StringTemplate childIndexST, |