[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects SybaseDialect.java, 1
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 SybaseDialect.java, 1.29, 1.30 Oracle9iDialect.java, 1.28, 1.29 DaffodilDialect.java, 1.25, 1.26 McKoiDialect.java, 1.23, 1.24 H2Dialect.java, 1.32, 1.33 SQLServerDialect.java, 1.27, 1.28 AxionDialect.java, 1.24, 1.25 FrontBaseDialect.java, 1.25, 1.26 DialectUtils.java, 1.34, 1.35 InterbaseDialect.java, 1.22, 1.23 HADBDialect.java, 1.19, 1.20 DerbyDialect.java, 1.24, 1.25 PointbaseDialect.java, 1.24, 1.25 StringTemplateConstants.java, 1.3, 1.4 IngresDialect.java, 1.25, 1.26 InformixDialect.java, 1.28, 1.29 MySQLDialect.java, 1.28, 1.29 HSQLDialect.java, 1.28, 1.29 PostgreSQLDialect.java, 1.27, 1.28 DB2Dialect.java, 1.28, 1.29 HibernateDialect.java, 1.23, 1.24 ProgressDialect.java, 1.23, 1.24 FirebirdDialect.java, 1.25, 1.26 TimesTenDialect.java, 1.22, 1.23 MAXDBDialect.java, 1.26, 1.27
Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13055/fw/src/net/sourceforge/squirrel_sql/fw/dialects Modified Files: SybaseDialect.java Oracle9iDialect.java DaffodilDialect.java McKoiDialect.java H2Dialect.java SQLServerDialect.java AxionDialect.java FrontBaseDialect.java DialectUtils.java InterbaseDialect.java HADBDialect.java DerbyDialect.java PointbaseDialect.java StringTemplateConstants.java IngresDialect.java InformixDialect.java MySQLDialect.java HSQLDialect.java PostgreSQLDialect.java DB2Dialect.java HibernateDialect.java ProgressDialect.java FirebirdDialect.java TimesTenDialect.java MAXDBDialect.java Log Message: Finished H2 refactorings. Added supported refactorings tab to session node in object tree. Index: DB2Dialect.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/DB2Dialect.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** DB2Dialect.java 20 Jan 2008 21:34:57 -0000 1.28 --- DB2Dialect.java 29 Jan 2008 03:17:04 -0000 1.29 *************** *** 940,943 **** --- 940,950 ---- } + /** + * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#supportsViewDefinition() + */ + public boolean supportsViewDefinition() { + return true; + } + public String getViewDefinitionSQL(String viewName, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) Index: HADBDialect.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/HADBDialect.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** HADBDialect.java 20 Jan 2008 21:34:57 -0000 1.19 --- HADBDialect.java 29 Jan 2008 03:17:03 -0000 1.20 *************** *** 744,747 **** --- 744,755 ---- return true; } + + /** + * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#supportsViewDefinition() + */ + public boolean supportsViewDefinition() { + // TODO verify this is correct + return false; + } /** Index: SybaseDialect.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/SybaseDialect.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** SybaseDialect.java 26 Jan 2008 21:06:44 -0000 1.29 --- SybaseDialect.java 29 Jan 2008 03:17:03 -0000 1.30 *************** *** 1027,1030 **** --- 1027,1037 ---- /** + * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#supportsViewDefinition() + */ + public boolean supportsViewDefinition() { + return true; + } + + /** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getViewDefinitionSQL(java.lang.String, * net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier, Index: InformixDialect.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/InformixDialect.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** InformixDialect.java 20 Jan 2008 21:34:57 -0000 1.28 --- InformixDialect.java 29 Jan 2008 03:17:04 -0000 1.29 *************** *** 1113,1116 **** --- 1113,1123 ---- /** + * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#supportsViewDefinition() + */ + public boolean supportsViewDefinition() { + return true; + } + + /** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getViewDefinitionSQL(java.lang.String, * net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier, Index: HSQLDialect.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/HSQLDialect.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** HSQLDialect.java 20 Jan 2008 21:34:57 -0000 1.28 --- HSQLDialect.java 29 Jan 2008 03:17:04 -0000 1.29 *************** *** 826,829 **** --- 826,837 ---- /** + * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#supportsViewDefinition() + */ + public boolean supportsViewDefinition() { + // TODO verify this is correct + return false; + } + + /** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getViewDefinitionSQL(java.lang.String, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier, net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences) */ Index: ProgressDialect.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/ProgressDialect.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** ProgressDialect.java 20 Jan 2008 21:34:57 -0000 1.23 --- ProgressDialect.java 29 Jan 2008 03:17:04 -0000 1.24 *************** *** 780,783 **** --- 780,791 ---- /** + * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#supportsViewDefinition() + */ + public boolean supportsViewDefinition() { + // TODO verify this is correct + return false; + } + + /** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getViewDefinitionSQL(java.lang.String, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier, net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences) */ Index: MAXDBDialect.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/MAXDBDialect.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** MAXDBDialect.java 20 Jan 2008 21:34:57 -0000 1.26 --- MAXDBDialect.java 29 Jan 2008 03:17:05 -0000 1.27 *************** *** 775,778 **** --- 775,786 ---- /** + * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#supportsViewDefinition() + */ + public boolean supportsViewDefinition() { + // TODO verify this is correct + return false; + } + + /** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getViewDefinitionSQL(java.lang.String, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier, net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences) */ Index: McKoiDialect.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/McKoiDialect.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** McKoiDialect.java 20 Jan 2008 21:34:57 -0000 1.23 --- McKoiDialect.java 29 Jan 2008 03:17:03 -0000 1.24 *************** *** 768,771 **** --- 768,779 ---- /** + * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#supportsViewDefinition() + */ + public boolean supportsViewDefinition() { + // TODO verify this is correct + return false; + } + + /** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getViewDefinitionSQL(java.lang.String, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier, net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences) */ Index: StringTemplateConstants.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/StringTemplateConstants.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** StringTemplateConstants.java 26 Jan 2008 21:06:44 -0000 1.3 --- StringTemplateConstants.java 29 Jan 2008 03:17:04 -0000 1.4 *************** *** 33,49 **** String ST_ADD_UNIQUE_CONSTRAINT_STYLE_ONE = "ALTER TABLE $tableName$ " + ! "ADD $constraint$ $constraintName$ UNIQUE $index$ $indexName$ $indexType$ ( $indexColumnName$ )"; String ST_ADD_UNIQUE_CONSTRAINT_STYLE_TWO = "ALTER TABLE $tableName$ " + ! "add constraint $constraintName$ unique ($columnName; separator=\",\"$ )"; String ST_ADD_AUTO_INCREMENT_STYLE_ONE = "ALTER TABLE $tableName$ MODIFY $columnName$ BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY"; String ST_ADD_FOREIGN_KEY_CONSTRAINT_STYLE_ONE = "ALTER TABLE $childTableName$ " + "ADD $constraint$ $constraintName$ FOREIGN KEY ( $childColumn; separator=\",\"$ ) " + "REFERENCES $parentTableName$ ( $parentColumn; separator=\",\"$ )"; String ST_CREATE_INDEX_STYLE_ONE = --- 33,57 ---- String ST_ADD_UNIQUE_CONSTRAINT_STYLE_ONE = "ALTER TABLE $tableName$ " + ! "ADD $constraint$ $constraintName$ UNIQUE $index$ $indexName$ $indexType$ ($columnName; separator=\",\"$)"; String ST_ADD_UNIQUE_CONSTRAINT_STYLE_TWO = "ALTER TABLE $tableName$ " + ! "ADD CONSTRAINT $constraintName$ UNIQUE ($columnName; separator=\",\"$)"; String ST_ADD_AUTO_INCREMENT_STYLE_ONE = "ALTER TABLE $tableName$ MODIFY $columnName$ BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY"; + String ST_ADD_AUTO_INCREMENT_STYLE_TWO = + "ALTER TABLE $tableName$ ALTER COLUMN $columnName$ IDENTITY"; + String ST_ADD_FOREIGN_KEY_CONSTRAINT_STYLE_ONE = "ALTER TABLE $childTableName$ " + "ADD $constraint$ $constraintName$ FOREIGN KEY ( $childColumn; separator=\",\"$ ) " + "REFERENCES $parentTableName$ ( $parentColumn; separator=\",\"$ )"; + + String ST_ALTER_SEQUENCE_STYLE_ONE = + "ALTER SEQUENCE $sequenceName$ " + + "$restartWith$ $startValue$ " + + "$incrementBy$ $incrementValue$ "; String ST_CREATE_INDEX_STYLE_ONE = *************** *** 55,58 **** --- 63,74 ---- "ON $tableName$ ( $columnName; separator=\",\"$ )"; + String ST_CREATE_SEQUENCE_STYLE_ONE = + "CREATE SEQUENCE $sequenceName$ START WITH $startValue$ " + + "INCREMENT BY $incrementValue$ $cache$ $cacheValue$"; + + String ST_CREATE_VIEW_STYLE_ONE = + "CREATE VIEW $viewName$ " + + "AS $selectStatement$ $with$ $checkOptionType$ $checkOption$"; + String ST_DROP_CONSTRAINT_STYLE_ONE = "ALTER TABLE $tableName$ DROP CONSTRAINT $constraintName$"; *************** *** 64,70 **** "DROP INDEX $tableName$.$indexName$"; ! String ST_CREATE_VIEW_STYLE_ONE = ! "CREATE VIEW $viewName$ " + ! "AS $selectStatement$ $with$ $checkOptionType$ $checkOption$"; String ST_SP_RENAME_STYLE_ONE = --- 80,94 ---- "DROP INDEX $tableName$.$indexName$"; ! String ST_DROP_INDEX_STYLE_THREE = ! "DROP INDEX $indexName$"; ! ! String ST_DROP_SEQUENCE_STYLE_ONE = ! "DROP SEQUENCE $sequenceName$ $cascade$"; ! ! String ST_DROP_VIEW_STYLE_ONE = ! "DROP VIEW $viewName$"; ! ! String ST_RENAME_OBJECT_STYLE_ONE = ! "ALTER TABLE $oldObjectName$ RENAME TO $newObjectName$"; String ST_SP_RENAME_STYLE_ONE = *************** *** 75,78 **** --- 99,106 ---- String ST_ACCESS_METHOD_KEY = "accessMethod"; + String ST_CACHE_KEY = "cache"; + + String ST_CACHE_VALUE_KEY = "cacheValue"; + String ST_CATALOG_NAME_KEY = "catalogName"; *************** *** 91,94 **** --- 119,126 ---- String ST_CONSTRAINT_NAME_KEY = "constraintName"; + String ST_INCREMENT_VALUE_KEY = "incrementValue"; + + String ST_INCREMENT_BY_KEY = "incrementBy"; + String ST_INDEX_COLUMNS_KEY = "indexColumns"; *************** *** 109,116 **** --- 141,154 ---- String ST_PARENT_TABLE_KEY = "parentTableName"; + String ST_RESTART_WITH_KEY = "restartWith"; + + String ST_SCHEMA_NAME_KEY = "schemaName"; + String ST_SEQUENCE_NAME_KEY = "sequenceName"; String ST_SELECT_STATEMENT_KEY = "selectStatement"; + String ST_START_VALUE_KEY = "startValue"; + String ST_STORAGE_OPTION_KEY = "storageOption"; Index: H2Dialect.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/H2Dialect.java,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** H2Dialect.java 20 Jan 2008 21:34:57 -0000 1.32 --- H2Dialect.java 29 Jan 2008 03:17:03 -0000 1.33 *************** *** 8,11 **** --- 8,12 ---- import java.util.ArrayList; import java.util.Collection; + import java.util.HashMap; import java.util.List; *************** *** 16,19 **** --- 17,21 ---- import net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo; [...1274 lines suppressed...] + */ + public String getViewDefinitionSQL(String viewName, DatabaseObjectQualifier qualifier, + SqlGenerationPreferences prefs) + { + // "select view_definition " + + // "from information_schema.views " + + // "where table_schema = ? " + + // "and table_name = ? "; + String templateStr = + "select view_definition from information_schema.views " + + "where table_schema = '$schemaName$' and UPPER(table_name) = UPPER('$viewName$') "; + + StringTemplate st = new StringTemplate(templateStr); + st.setAttribute(ST_SCHEMA_NAME_KEY, qualifier.getSchema()); + st.setAttribute(ST_VIEW_NAME_KEY, viewName); + + return st.toString(); + } + } Index: SQLServerDialect.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/SQLServerDialect.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** SQLServerDialect.java 26 Jan 2008 21:06:44 -0000 1.27 --- SQLServerDialect.java 29 Jan 2008 03:17:03 -0000 1.28 *************** *** 506,509 **** --- 506,517 ---- /** + * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#supportsViewDefinition() + */ + public boolean supportsViewDefinition() { + // TODO verify this is correct + return false; + } + + /** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#supportsRenameView() */ Index: MySQLDialect.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/MySQLDialect.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** MySQLDialect.java 26 Jan 2008 21:06:44 -0000 1.28 --- MySQLDialect.java 29 Jan 2008 03:17:04 -0000 1.29 *************** *** 644,650 **** StringTemplate ckIndexSt = null; HashMap<String, String> ckIndexValuesMap = null; if (autoFKIndex) { ! ckIndexSt = new StringTemplate(); ckIndexValuesMap = new HashMap<String, String>(); } --- 644,655 ---- StringTemplate ckIndexSt = null; HashMap<String, String> ckIndexValuesMap = null; + if (autoFKIndex) { ! // "CREATE $unique$ $storageOption$ INDEX $indexName$ " + ! // "ON $tableName$ ( $columnName; separator=\",\"$ )"; ! ! ckIndexSt = new StringTemplate(ST_CREATE_INDEX_STYLE_TWO); ckIndexValuesMap = new HashMap<String, String>(); + ckIndexValuesMap.put(ST_INDEX_NAME_KEY, "fk_child_idx"); } *************** *** 1135,1138 **** --- 1140,1151 ---- /** + * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#supportsViewDefinition() + */ + public boolean supportsViewDefinition() { + // TODO verify this is correct + return false; + } + + /** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getViewDefinitionSQL(java.lang.String, * net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier, Index: FirebirdDialect.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/FirebirdDialect.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** FirebirdDialect.java 20 Jan 2008 21:34:57 -0000 1.25 --- FirebirdDialect.java 29 Jan 2008 03:17:04 -0000 1.26 *************** *** 893,896 **** --- 893,904 ---- /** + * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#supportsViewDefinition() + */ + public boolean supportsViewDefinition() { + // TODO verify this is correct + return false; + } + + /** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getViewDefinitionSQL(java.lang.String, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier, net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences) */ Index: Oracle9iDialect.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/Oracle9iDialect.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** Oracle9iDialect.java 21 Jan 2008 22:29:08 -0000 1.28 --- Oracle9iDialect.java 29 Jan 2008 03:17:03 -0000 1.29 *************** *** 1175,1178 **** --- 1175,1186 ---- /** + * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#supportsViewDefinition() + */ + public boolean supportsViewDefinition() { + // TODO verify this is correct + return false; + } + + /** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getViewDefinitionSQL(java.lang.String, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier, net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences) */ Index: AxionDialect.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/AxionDialect.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** AxionDialect.java 20 Jan 2008 21:34:57 -0000 1.24 --- AxionDialect.java 29 Jan 2008 03:17:03 -0000 1.25 *************** *** 923,926 **** --- 923,934 ---- /** + * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#supportsViewDefinition() + */ + public boolean supportsViewDefinition() { + // TODO verify this is correct + return false; + } + + /** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getViewDefinitionSQL(java.lang.String, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier, net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences) */ Index: TimesTenDialect.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/TimesTenDialect.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** TimesTenDialect.java 20 Jan 2008 21:34:57 -0000 1.22 --- TimesTenDialect.java 29 Jan 2008 03:17:05 -0000 1.23 *************** *** 773,776 **** --- 773,784 ---- /** + * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#supportsViewDefinition() + */ + public boolean supportsViewDefinition() { + // TODO verify this is correct + return false; + } + + /** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getViewDefinitionSQL(java.lang.String, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier, net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences) */ Index: PointbaseDialect.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/PointbaseDialect.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** PointbaseDialect.java 20 Jan 2008 21:34:57 -0000 1.24 --- PointbaseDialect.java 29 Jan 2008 03:17:04 -0000 1.25 *************** *** 766,769 **** --- 766,777 ---- /** + * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#supportsViewDefinition() + */ + public boolean supportsViewDefinition() { + // TODO verify this is correct + return false; + } + + /** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getViewDefinitionSQL(java.lang.String, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier, net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences) */ Index: FrontBaseDialect.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/FrontBaseDialect.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** FrontBaseDialect.java 20 Jan 2008 21:34:57 -0000 1.25 --- FrontBaseDialect.java 29 Jan 2008 03:17:03 -0000 1.26 *************** *** 798,801 **** --- 798,809 ---- /** + * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#supportsViewDefinition() + */ + public boolean supportsViewDefinition() { + // TODO verify this is correct + return false; + } + + /** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getViewDefinitionSQL(java.lang.String, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier, net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences) */ Index: HibernateDialect.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/HibernateDialect.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** HibernateDialect.java 20 Jan 2008 21:34:57 -0000 1.23 --- HibernateDialect.java 29 Jan 2008 03:17:04 -0000 1.24 *************** *** 952,955 **** --- 952,963 ---- /** + * Whether or not the definition of a view can be determined via a query that is returned from + * getViewDefinitionSQL method + * + * @return true if getViewDefinitionSQL yields a non-null value; false otherwise. + */ + 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 Index: InterbaseDialect.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/InterbaseDialect.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** InterbaseDialect.java 20 Jan 2008 21:34:57 -0000 1.22 --- InterbaseDialect.java 29 Jan 2008 03:17:03 -0000 1.23 *************** *** 20,23 **** --- 20,24 ---- import java.sql.SQLException; + import java.sql.Types; import java.util.Collection; import java.util.List; *************** *** 38,56 **** super(); /* ! * TODO: hookup with Interbase spec and adjust these as necessary. registerColumnType(Types.BIGINT, ! * "integer"); registerColumnType(Types.BINARY, 2000000000,"bit varying($l)"); ! * registerColumnType(Types.BIT, "bit(1)"); registerColumnType(Types.BLOB, 2000000000, "bit ! * varying($l)"); registerColumnType(Types.BOOLEAN, "bit(1)"); registerColumnType(Types.CHAR, ! * 2000000000, "char($l)"); registerColumnType(Types.CLOB, 2000000000, "varchar($l)"); ! * registerColumnType(Types.DATE, "date"); registerColumnType(Types.DECIMAL, "decimal(36,2"); ! * registerColumnType(Types.DOUBLE, "double precision"); registerColumnType(Types.FLOAT, 15, ! * "float($l)"); registerColumnType(Types.INTEGER, "integer"); registerColumnType(Types.LONGVARBINARY, ! * 2000000000, "bit varying($l)"); registerColumnType(Types.LONGVARCHAR, 31995, "varchar($l)"); ! * registerColumnType(Types.NUMERIC, "numeric(17,2)"); registerColumnType(Types.REAL, "real"); ! * registerColumnType(Types.SMALLINT, "smallint"); registerColumnType(Types.TIME, "date"); ! * registerColumnType(Types.TIMESTAMP, "timestamp"); registerColumnType(Types.TINYINT, "tinyint"); ! * registerColumnType(Types.VARBINARY, 31995, "bit varying($l)"); registerColumnType(Types.VARCHAR, ! * 2000000000,"varchar($l)"); */ } --- 39,62 ---- super(); /* ! * TODO: hookup with Interbase spec and adjust these as necessary. */ + // What follows comes from the standard hibernate dialect. + registerColumnType( Types.BIT, "smallint" ); + registerColumnType( Types.BIGINT, "numeric(18,0)" ); + registerColumnType( Types.SMALLINT, "smallint" ); + registerColumnType( Types.TINYINT, "smallint" ); + registerColumnType( Types.INTEGER, "integer" ); + registerColumnType( Types.CHAR, "char(1)" ); + registerColumnType( Types.VARCHAR, "varchar($l)" ); + registerColumnType( Types.FLOAT, "float" ); + registerColumnType( Types.DOUBLE, "double precision" ); + registerColumnType( Types.DATE, "date" ); + registerColumnType( Types.TIME, "time" ); + registerColumnType( Types.TIMESTAMP, "timestamp" ); + registerColumnType( Types.VARBINARY, "blob" ); + registerColumnType( Types.NUMERIC, "numeric($p,$s)" ); + registerColumnType( Types.BLOB, "blob" ); + registerColumnType( Types.CLOB, "blob sub_type 1" ); + } *************** *** 756,759 **** --- 762,773 ---- /** + * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#supportsViewDefinition() + */ + public boolean supportsViewDefinition() { + // TODO verify this is correct + return false; + } + + /** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getViewDefinitionSQL(java.lang.String, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier, net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences) */ Index: PostgreSQLDialect.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/PostgreSQLDialect.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** PostgreSQLDialect.java 20 Jan 2008 21:34:57 -0000 1.27 --- PostgreSQLDialect.java 29 Jan 2008 03:17:04 -0000 1.28 *************** *** 1176,1179 **** --- 1176,1187 ---- /** + * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#supportsViewDefinition() + */ + public boolean supportsViewDefinition() { + // TODO verify this is correct + return false; + } + + /** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getViewDefinitionSQL(java.lang.String, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier, net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences) */ Index: DerbyDialect.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/DerbyDialect.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** DerbyDialect.java 16 Jan 2008 01:52:07 -0000 1.24 --- DerbyDialect.java 29 Jan 2008 03:17:04 -0000 1.25 *************** *** 571,574 **** --- 571,581 ---- /** + * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#supportsViewDefinition() + */ + public boolean supportsViewDefinition() { + return true; + } + + /** * @see net.sourceforge.squirrel_sql.fw.dialects.DB2Dialect#getViewDefinitionSQL(java.lang.String, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier, net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences) */ Index: DialectUtils.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/DialectUtils.java,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** DialectUtils.java 26 Jan 2008 21:06:44 -0000 1.34 --- DialectUtils.java 29 Jan 2008 03:17:03 -0000 1.35 *************** *** 2480,2483 **** --- 2480,2486 ---- DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) { + if (value == null || "".equals(value)) { + return; + } if (ST_TABLE_NAME_KEY.equals(key)) { *************** *** 2511,2514 **** --- 2514,2525 ---- } + /** + * @param dialect + * @param st + * @param valuesMap + * @param qualifier + * @param prefs + * @return + */ public static String bindTemplateAttributes(HibernateDialect dialect, StringTemplate st, HashMap<String, String> valuesMap, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) *************** *** 2517,2520 **** --- 2528,2564 ---- return st.toString(); } + + /** + * @param dialect the dialect that this attribute binding is meant for + * @param st the String template + * @param valuesMap a map of key/value pairs to bind into the template + * @param columns the TableColumnInfos to use for column names in the column list + * @param qualifier the specifics regarding schema / catalog + * @param prefs user's preferences regarding qualifying identifiers + * @return the SQL result of binding key/values and column list into the specified template + */ + public static String bindTemplateAttributes(HibernateDialect dialect, StringTemplate st, + HashMap<String, String> valuesMap, TableColumnInfo[] columns, DatabaseObjectQualifier qualifier, + SqlGenerationPreferences prefs) + { + bindAttributes(dialect, st, valuesMap, qualifier, prefs); + for (TableColumnInfo column : columns) + { + bindAttribute(dialect, st, ST_COLUMN_NAME_KEY, column.getColumnName(), qualifier, prefs); + } + return st.toString(); + } + + + public static HashMap<String, String> getValuesMap(String... elts) { + HashMap<String, String> valuesMap = new HashMap<String, String>(); + for (int i = 0; i < elts.length-1; i++) { + valuesMap.put(elts[i], elts[i+1]); + } + return valuesMap; + } + public static boolean isNotEmptyString(String value) { + return (value != null) && (!"".equals(value)); + } } Index: IngresDialect.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/IngresDialect.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** IngresDialect.java 20 Jan 2008 21:34:57 -0000 1.25 --- IngresDialect.java 29 Jan 2008 03:17:04 -0000 1.26 *************** *** 811,814 **** --- 811,822 ---- /** + * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#supportsViewDefinition() + */ + public boolean supportsViewDefinition() { + // TODO verify this is correct + return false; + } + + /** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getViewDefinitionSQL(java.lang.String, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier, net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences) */ Index: DaffodilDialect.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/DaffodilDialect.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** DaffodilDialect.java 20 Jan 2008 21:34:57 -0000 1.25 --- DaffodilDialect.java 29 Jan 2008 03:17:03 -0000 1.26 *************** *** 799,802 **** --- 799,810 ---- /** + * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#supportsViewDefinition() + */ + public boolean supportsViewDefinition() { + // TODO verify this is correct + return false; + } + + /** * @see net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect#getViewDefinitionSQL(java.lang.String, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier, net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences) */ |