Thread: [Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6264] trunk/sql12/plugins/sqlscript/src/main/java
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
Revision: 6264 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6264&view=rev Author: manningr Date: 2011-05-17 01:23:40 +0000 (Tue, 17 May 2011) Log Message: ----------- Create data script command now produces a properly formatted hex string for binary fields. Modified Paths: -------------- trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptCommand.java Modified: trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptCommand.java =================================================================== --- trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptCommand.java 2011-05-17 01:11:28 UTC (rev 6263) +++ trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptCommand.java 2011-05-17 01:23:40 UTC (rev 6264) @@ -20,6 +20,7 @@ */ import java.awt.event.WindowAdapter; +import java.sql.Blob; import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; @@ -203,6 +204,7 @@ throws SQLException { ResultSetMetaData metaData = srcResult.getMetaData(); + final HibernateDialect dialect = DialectFactory.getDialect(_session.getMetaData()); int iColumnCount = metaData.getColumnCount(); ColumnInfo[] colInfo = new ColumnInfo[iColumnCount]; @@ -347,17 +349,34 @@ sbValues.append(getNullableComment(metaData, i+1)); } } + else if (Types.BLOB == colInfo[i].sqlType + || Types.BINARY == colInfo[i].sqlType) { + if(fromResultSet) { + if(srcResult.wasNull()) { + sbValues.append("null"); + } else { + byte[] binaryData = null; + if (Types.BLOB == colInfo[i].sqlType) { + Blob blobResult = srcResult.getBlob(i+1); + binaryData = blobResult.getBytes(1, (int)blobResult.length()); + } else { + binaryData = srcResult.getBytes(i+1); + } + sbValues.append(dialect.getBinaryLiteralString(binaryData)); + } + } else { + sbValues.append("'CAFEBABE'").append(getNullableComment(metaData, i+1)); + } + } else // Types.CHAR, // Types.VARCHAR, // Types.LONGVARCHAR, - // Types.BINARY, // Types.VARBINARY // Types.LONGVARBINARY // Types.NULL // Types.JAVA_OBJECT // Types.DISTINCT // Types.ARRAY - // Types.BLOB // Types.CLOB // Types.REF // Types.DATALINK This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 6292 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6292&view=rev Author: wis775 Date: 2011-06-05 13:28:35 +0000 (Sun, 05 Jun 2011) Log Message: ----------- Using the script "Store result of SQL in table" twice, then I get the cancel dialog in a unusable state. This occurs only on my Ubuntu 10.10 with Java 1.6.0_24. On my Windows system, it works fine. This small sleep does the job. (Some cleanup) Modified Paths: -------------- trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptCommand.java Modified: trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptCommand.java =================================================================== --- trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptCommand.java 2011-06-05 13:27:09 UTC (rev 6291) +++ trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptCommand.java 2011-06-05 13:28:35 UTC (rev 6292) @@ -135,7 +135,7 @@ { if (dbObjs[k] instanceof ITableInfo) { - if (_abortController.isStop()) break; + if (isAborted()) break; ITableInfo ti = (ITableInfo) dbObjs[k]; String sTable = ScriptUtil.getTableName(ti); StringBuilder sql = new StringBuilder(); @@ -179,7 +179,7 @@ _session.selectMainTab(ISession.IMainPanelTabIndexes.SQL_TAB); } - _abortController.setVisible(false); + hideAbortFrame(); } }); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 6703 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6703&view=rev Author: manningr Date: 2012-10-28 14:44:05 +0000 (Sun, 28 Oct 2012) Log Message: ----------- Fixed compile issue for integration test project. Modified Paths: -------------- trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptCommand.java Modified: trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptCommand.java =================================================================== --- trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptCommand.java 2012-10-27 11:51:54 UTC (rev 6702) +++ trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptCommand.java 2012-10-28 14:44:05 UTC (rev 6703) @@ -75,6 +75,19 @@ _abortController = new AbortController(owningFrame); } + /** + * Ctor specifying the current session and IAbortController. + */ + public CreateDataScriptCommand(ISession session, IAbortController abortController, SQLScriptPlugin plugin, + boolean templateScriptOnly) + { + super(); + _session = session; + _plugin = plugin; + _templateScriptOnly = templateScriptOnly; + _abortController = abortController; + } + protected void showAbortFrame() { if (false == _abortController.isVisble()) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |