Email Archive: squirrel-sql-commits (read-only)
|
[Squirrel-sql-commits]
sql12/plugins/refactoring/src/net/sourceforge/squirrel_sql/plugins/refactoring/commands
ModifyColumnCommand.java, 1.8, 1.9 DropPrimaryKeyCommand.java,
1.3, 1.4 AddPrimaryKeyCommand.java, 1.7,
1.8 AddColumnCommand.java, 1.8, 1.9 RemoveColumnCommand.java,
1.9, 1.10 DropTablesCommand.java, 1.4, 1.5
From: Rob Manning <manningr@us...> - 2007-04-08 11:49
|
Update of /cvsroot/squirrel-sql/sql12/plugins/refactoring/src/net/sourceforge/squirrel_sql/plugins/refactoring/commands
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv844/plugins/refactoring/src/net/sourceforge/squirrel_sql/plugins/refactoring/commands
Modified Files:
ModifyColumnCommand.java DropPrimaryKeyCommand.java
AddPrimaryKeyCommand.java AddColumnCommand.java
RemoveColumnCommand.java DropTablesCommand.java
Log Message:
Task #137953 (Consolidate tests for dbms type). Relocated DialectFactory to fw - it didn't need a dependency on
ISession, and does need to be used by fw module classes. Now, code that needs to determine which database
a session is speaking to, should use DialectFactory.
Index: DropPrimaryKeyCommand.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/refactoring/src/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropPrimaryKeyCommand.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DropPrimaryKeyCommand.java 14 Jan 2007 23:16:56 -0000 1.3
--- DropPrimaryKeyCommand.java 8 Apr 2007 11:48:42 -0000 1.4
***************
*** 23,30 ****
import java.awt.event.ActionListener;
- import net.sourceforge.squirrel_sql.client.db.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.client.gui.db.ColumnListDialog;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
--- 23,30 ----
import java.awt.event.ActionListener;
import net.sourceforge.squirrel_sql.client.gui.db.ColumnListDialog;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+ import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
***************
*** 97,101 ****
String result = null;
try {
! dialect = DialectFactory.getDialect(_session, DialectFactory.DEST_TYPE);
result =
dialect.getDropPrimaryKeySQL(this.pkName,
--- 97,103 ----
String result = null;
try {
! dialect = DialectFactory.getDialect(DialectFactory.DEST_TYPE,
! _session.getApplication().getMainFrame(),
! _session.getMetaData());
result =
dialect.getDropPrimaryKeySQL(this.pkName,
Index: ModifyColumnCommand.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/refactoring/src/net/sourceforge/squirrel_sql/plugins/refactoring/commands/ModifyColumnCommand.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ModifyColumnCommand.java 14 Jan 2007 23:16:56 -0000 1.8
--- ModifyColumnCommand.java 8 Apr 2007 11:48:42 -0000 1.9
***************
*** 26,30 ****
import javax.swing.JOptionPane;
- import net.sourceforge.squirrel_sql.client.db.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.client.gui.db.ColumnDetailDialog;
import net.sourceforge.squirrel_sql.client.gui.db.ColumnListDialog;
--- 26,29 ----
***************
*** 32,35 ****
--- 31,35 ----
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+ import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
***************
*** 154,158 ****
try {
dialect =
! DialectFactory.getDialect(_session, DialectFactory.DEST_TYPE);
String dbName = dialect.getDisplayName();
columnDetailDialog =
--- 154,160 ----
try {
dialect =
! DialectFactory.getDialect(DialectFactory.DEST_TYPE,
! _session.getApplication().getMainFrame(),
! _session.getMetaData());
String dbName = dialect.getDisplayName();
columnDetailDialog =
Index: DropTablesCommand.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/refactoring/src/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropTablesCommand.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DropTablesCommand.java 24 Mar 2007 01:33:42 -0000 1.4
--- DropTablesCommand.java 8 Apr 2007 11:48:44 -0000 1.5
***************
*** 27,35 ****
import java.util.List;
- import net.sourceforge.squirrel_sql.client.db.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.client.gui.ProgessCallBackDialog;
import net.sourceforge.squirrel_sql.client.session.DefaultSQLExecuterHandler;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
--- 27,35 ----
import java.util.List;
import net.sourceforge.squirrel_sql.client.gui.ProgessCallBackDialog;
import net.sourceforge.squirrel_sql.client.session.DefaultSQLExecuterHandler;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+ import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
***************
*** 116,120 ****
orderedTables = getOrderedTables(tables);
! dialect = DialectFactory.getDialect(_session, DialectFactory.DEST_TYPE);
String sep = _session.getQueryTokenizer().getSQLStatementSeparator();
--- 116,122 ----
orderedTables = getOrderedTables(tables);
! dialect = DialectFactory.getDialect(DialectFactory.DEST_TYPE,
! _session.getApplication().getMainFrame(),
! _session.getMetaData());
String sep = _session.getQueryTokenizer().getSQLStatementSeparator();
***************
*** 174,178 ****
ISession session)
{
! if (!DialectFactory.isOracleSession(session)) {
// Only Oracle supports materialized views directly.
return false;
--- 176,180 ----
ISession session)
{
! if (!DialectFactory.isOracle(session.getMetaData())) {
// Only Oracle supports materialized views directly.
return false;
Index: AddPrimaryKeyCommand.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/refactoring/src/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddPrimaryKeyCommand.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AddPrimaryKeyCommand.java 14 Jan 2007 23:16:56 -0000 1.7
--- AddPrimaryKeyCommand.java 8 Apr 2007 11:48:42 -0000 1.8
***************
*** 23,30 ****
import java.awt.event.ActionListener;
- import net.sourceforge.squirrel_sql.client.db.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.client.gui.db.ColumnListDialog;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
--- 23,30 ----
import java.awt.event.ActionListener;
import net.sourceforge.squirrel_sql.client.gui.db.ColumnListDialog;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+ import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
***************
*** 104,108 ****
String[] result = null;
try {
! dialect = DialectFactory.getDialect(_session, DialectFactory.DEST_TYPE);
String pkName = columnListDialog.getPrimaryKeyName();
--- 104,110 ----
String[] result = null;
try {
! dialect = DialectFactory.getDialect(DialectFactory.DEST_TYPE,
! _session.getApplication().getMainFrame(),
! _session.getMetaData());
String pkName = columnListDialog.getPrimaryKeyName();
Index: AddColumnCommand.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/refactoring/src/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddColumnCommand.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AddColumnCommand.java 14 Jan 2007 23:16:56 -0000 1.8
--- AddColumnCommand.java 8 Apr 2007 11:48:43 -0000 1.9
***************
*** 28,36 ****
import javax.swing.JOptionPane;
- import net.sourceforge.squirrel_sql.client.db.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.client.gui.db.ColumnDetailDialog;
import net.sourceforge.squirrel_sql.client.gui.mainframe.MainFrame;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
--- 28,36 ----
import javax.swing.JOptionPane;
import net.sourceforge.squirrel_sql.client.gui.db.ColumnDetailDialog;
import net.sourceforge.squirrel_sql.client.gui.mainframe.MainFrame;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+ import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
***************
*** 82,86 ****
try {
dialect =
! DialectFactory.getDialect(_session, DialectFactory.DEST_TYPE);
String dbName = dialect.getDisplayName();
columnDetailDialog = new ColumnDetailDialog(ColumnDetailDialog.ADD_MODE);
--- 82,88 ----
try {
dialect =
! DialectFactory.getDialect(DialectFactory.DEST_TYPE,
! _session.getApplication().getMainFrame(),
! _session.getMetaData());
String dbName = dialect.getDisplayName();
columnDetailDialog = new ColumnDetailDialog(ColumnDetailDialog.ADD_MODE);
Index: RemoveColumnCommand.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/refactoring/src/net/sourceforge/squirrel_sql/plugins/refactoring/commands/RemoveColumnCommand.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** RemoveColumnCommand.java 20 Mar 2007 01:04:50 -0000 1.9
--- RemoveColumnCommand.java 8 Apr 2007 11:48:44 -0000 1.10
***************
*** 24,30 ****
import java.sql.SQLException;
- import net.sourceforge.squirrel_sql.client.db.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
--- 24,30 ----
import java.sql.SQLException;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+ import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
***************
*** 37,41 ****
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
- import net.sourceforge.squirrel_sql.plugins.refactoring.DBUtil;
/**
--- 37,40 ----
***************
*** 90,94 ****
try {
HibernateDialect dialect =
! DialectFactory.getDialect(_session, DialectFactory.DEST_TYPE);
if (!dialect.supportsDropColumn()) {
//i18n[RemoveColumnAction.removeColumnNotSupported=This
--- 89,95 ----
try {
HibernateDialect dialect =
! DialectFactory.getDialect(DialectFactory.DEST_TYPE,
! _session.getApplication().getMainFrame(),
! _session.getMetaData());
if (!dialect.supportsDropColumn()) {
//i18n[RemoveColumnAction.removeColumnNotSupported=This
***************
*** 125,129 ****
String[] result = new String[columns.length];
try {
! dialect = DialectFactory.getDialect(_session, DialectFactory.DEST_TYPE);
// TODO: add configuration for whether or not to qualify names.
String tableName = _info[0].getQualifiedName();
--- 126,132 ----
String[] result = new String[columns.length];
try {
! dialect = DialectFactory.getDialect(DialectFactory.DEST_TYPE,
! _session.getApplication().getMainFrame(),
! _session.getMetaData());
// TODO: add configuration for whether or not to qualify names.
String tableName = _info[0].getQualifiedName();
***************
*** 184,188 ****
try {
dialect =
! DialectFactory.getDialect(_session, DialectFactory.DEST_TYPE);
} catch (UserCancelledOperationException ex) {
log.info("User cancelled add column request");
--- 187,193 ----
try {
dialect =
! DialectFactory.getDialect(DialectFactory.DEST_TYPE,
! _session.getApplication().getMainFrame(),
! _session.getMetaData());
} catch (UserCancelledOperationException ex) {
log.info("User cancelled add column request");
|
Thread View
| Thread | Author | Date |
|---|---|---|
| [Squirrel-sql-commits] sql12/plugins/refactoring/src/net/sourceforge/squirrel_sql/plugins/refactoring/commands ModifyColumnCommand.java, 1.8, 1.9 DropPrimaryKeyCommand.java, 1.3, 1.4 AddPrimaryKeyCommand.java, 1.7, 1.8 AddColumnCommand.java, 1.8, 1.9 RemoveColumnCommand.java, 1.9, 1.10 DropTablesCommand.java, 1.4, 1.5 | Rob Manning <manningr@us...> |