From 809da6953c7b93ac58842589f04907c5d7fcbdb7 Mon Sep 17 00:00:00 2001 From: jwoehr Date: Wed, 20 Nov 2024 08:20:56 -0700 Subject: [PATCH] update info about db --- CHANGES.TXT | 2 + share/mssql/DbMSSQL.java | 66 --------------------- share/mssql/README.DbMSSQL.txt | 101 --------------------------------- userdoc/ubluref.html | 12 +--- 4 files changed, 5 insertions(+), 176 deletions(-) delete mode 100644 share/mssql/DbMSSQL.java delete mode 100644 share/mssql/README.DbMSSQL.txt diff --git a/CHANGES.TXT b/CHANGES.TXT index de7b1b64..a6b62aa0 100644 --- a/CHANGES.TXT +++ b/CHANGES.TXT @@ -7,6 +7,8 @@ All rights reserved. Open Source, see LICENSE * Libraries * Bump postgresql to 42.7.4 * Update SBOM +* Documentation + * Update info about database drivers 2.0.2 2024-08-05 ----- diff --git a/share/mssql/DbMSSQL.java b/share/mssql/DbMSSQL.java deleted file mode 100644 index bfda9ced..00000000 --- a/share/mssql/DbMSSQL.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2014, Absolute Performance, Inc. http://www.absolute-performance.com - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ -package ublu.db; - -import ublu.util.Generics; -import com.microsoft.sqlserver.jdbc.SQLServerDataSource; -import java.sql.Connection; -import java.sql.SQLException; - -/** - * Represents a Microsoft SQL Server database - * - * @author jwoehr - */ -public class DbMSSQL extends Db { - - /** - * MSSQL default port - */ - public static String MSSQL_DEFAULT_PORT = "1433"; - - /** - * Instance a representation of a Microsoft SQL Server database - */ - public DbMSSQL() { - super(); - this.dbType = DBTYPE.MSSQL; - } - - @Override - public Connection connect(String system, String port, String database, Generics.ConnectionProperties connectionProperties, String userid, String password) - throws ClassNotFoundException, SQLException { - loadDriver(); - SQLServerDataSource ds = new SQLServerDataSource(); - ds.setUser(userid); - ds.setPassword(password); - ds.setServerName(system); - ds.setPortNumber(Integer.parseInt(port == null ? MSSQL_DEFAULT_PORT : port)); - ds.setDatabaseName(database); - setConnection(ds.getConnection()); - return getConnection(); - } -} diff --git a/share/mssql/README.DbMSSQL.txt b/share/mssql/README.DbMSSQL.txt deleted file mode 100644 index a1cf339d..00000000 --- a/share/mssql/README.DbMSSQL.txt +++ /dev/null @@ -1,101 +0,0 @@ -2018-11-11 - -Ublu now by default compiles in Microsoft MSSQL [TM] support. - -The MSSQL JDBC driver is not included in the distribution. As of this writing, -the download url is: - - https://docs.microsoft.com/en-us/sql/connect/jdbc/download-microsoft-jdbc-driver-for-sql-server?view=sql-server-2017 - -Ublu did not use to compile in MSSQL support by default. The instructions below -starting at ADDING IN MSSQL SUPPORT describe how to add that support in. You -do not have to do this now, but if you want to use MSSQL support, you must -download the driver on your own and put it in the lib directory under -directory where ublu.jar is located. - -This means: - 1. As built and distributed, if you have downloaded on your own the MSSQL - JDBC driver, the db command will work for -dbtype mssql. - 2. As built and distributed, if you have *not* downloaded on your own the MSSQL - JDBC driver, the db command will fail for -dbtype mssql. - 3. To build Ublu from soure, you must either: - a. Comment out MSSQL support, or - b. Download the MSSQL JDBC driver (any recent level) and place in the - lib directory of the source distribution. You will need to modify the - lines referring to this jar in nbproject/project.properties if you - are using a different level of the driver than the one we are using. - -Therefor you may wish to execute the REMOVING MSSQL SUPPORT instructions in order -to remove MSSQL support if you do not want to download the driver. - -REMOVING MSSQL SUPPORT - -1. Use NetBeans project properties to remove the jar from the libraries sourced - by the build. Alternatively, you can remove it to nbproject/project.properties - at the end of the classpath property: - -javac.classpath=\ - ${file.reference.jt400.jar}:\ - ${file.reference.pigiron.jar}:\ - ${file.reference.tn5250j.jar}:\ - ${file.reference.sblim-cim-client2-HEAD.jar}:\ - ${file.reference.postgresql-42.2.5.jre7.jar}:\ - ${file.reference.mssql-jdbc-7.0.0.jre8.jar} # <<< REMOVE - - Also remove the line: - -file.reference.mssql-jdbc-7.0.0.jre8.jar=lib/mssql-jdbc-7.0.0.jre8.jar - -2. Remove the file DbMSSQL.java from the directory src/ublu/db - -3. Edit src/ublu/command/CmdDb.java and comment out the lines between each - "/* Uncomment the following if you are adding MSSQL support */" and - "/* End Uncomment */" - -4. Build and run. - -( Old instructions for adding in MSSQL Support ) -ADDING IN MSSQL SUPPORT -Ublu as compiled and set up in the source tree supports IBM i database and -PostgreSQL database. - -It can also support Microsoft's MSSQL [TM]. However, the distribution of the -JDBC driver for MSSQL carries a sufficiently complicated license that I have -chosen not to redistribute it myself. - -If you want MSSQL support: - - 1. Download the MSSQL JDBC driver from Microsoft Developer Network. As of - this writing, the url is: - https://docs.microsoft.com/en-us/sql/connect/jdbc/download-microsoft-jdbc-driver-for-sql-server?view=sql-server-2017 - - 2. Copy the jdbc driver jar, e.g., mssql-jdbc-7.0.0.jre8.jar to Ublu's lib directory. - - 3. Use NetBeans project properties to add the jar to the libraries sourced - by the build. Alternatively, you can add it to nbproject/project.properties - at the end of the classpath property: - -javac.classpath=\ - ${file.reference.jt400.jar}:\ - ${file.reference.pigiron.jar}:\ - ${file.reference.tn5250j.jar}:\ - ${file.reference.sblim-cim-client2-HEAD.jar}:\ - ${file.reference.postgresql-42.2.5.jre7.jar}:\ - ${file.reference.mssql-jdbc-7.0.0.jre8.jar} # <<< ADD - - ** NOTE that if you choose to download and use Microsoft's MSSQL JDBC driver - in Ublu, then any and all licensing requirements are Your Responsiblity. ** - - 4. Copy the file DbMSSQL.java from this directory to src/ublu/db - - 5. Edit src/ublu/command/CmdDb.java and uncomment the lines between each - "/* Uncomment the following if you are adding MSSQL support */" and - "/* End Uncomment */" - - 6. Build and run. - -As usual, there is NO WARRANTY nor GUARANTEE of correctness nor fitness etc. -a la Open Source always!! - -Jack Woehr -2016-08-24 diff --git a/userdoc/ubluref.html b/userdoc/ubluref.html index 2078b976..bbea5be0 100644 --- a/userdoc/ubluref.html +++ b/userdoc/ubluref.html @@ -11,7 +11,7 @@ "Documenting usage of Ublu which is an extensible object-disoriented interpretive language for midrange and mainframe remote system programming" name="description"> + "Wed, 20 Nov 2024 03:18:44 PM UTC"> @@ -5198,14 +5198,8 @@
Options
features and refinements will follow.

Note: As configured, db - supports IBM i database and PostgreSQL. Support for Microsoft - SQL ® is also provided, if you care to download the JDBC - driver yourself: it is not included with the distribution, - which was, however, compiled to support the driver if present. - Follow the directions in the README.DbMSSQL.txt - file in the directory share/mssql .

- Example (examples/dbexample.ublu) - + supports IBM i Db2 database, PostgreSQL. and Microsoft + SQL ®. 
 #