sql: rename SqlTest, and modify it so that it runs automatically agai…

…nst both mysql and postgres (#54)

etc/sql/config.props

@@ -9,11 +9,6 @@
 // which are loaded into the VM using Class.forName on startup
 // java.drivers=com.mysql.cj.jdbc.Driver
 
-// test setup
-test.uri=jdbc:mysql://localhost:3306/fantest
-test.username=fantest
-test.password=fantest
-
 // Uncomment this line to revert old "@@" escape behavior.
 // See https://github.com/fantom-lang/fantom/pull/51
 // deprecatedEscape=true

src/sql/pod.fandoc

@@ -16,36 +16,6 @@ with relational databases.  Its basic goals in life:
  - Statements: execute SQL statements
  - Model: model meta-data and relational tables
 
-Test Setup [#testSetup]
-***********************
-The sql tests use the following config props to determine the
-database configuration:
-  - 'test.uri': connection/jdbc url string, defaults
-    to "jdbc:mysql://localhost:3306/fantest"
-  - 'test.username': defaults to "fantest"
-  - 'test.password': defaults to "fantest"
-
-You can change these defaults via "etc/sql/config.props".
-
-We've been testing with MySql 5.0.41 running InnoDB using "fantest"
-for the database name, user name, and password.  You can configure
-InnoDB as the default storage engine with this line in your "my.cfg":
-  default-storage-engine=INNODB
-
-To setup the fantest database and user account via the mysql command line:
-  mysql -u root -p
-  mysql> create user fantest identified by 'fantest';
-  mysql> create database fantest;
-  mysql> grant all privileges on fantest.* to fantest;
-
-To use Postgres as the test database, modify "etc/sql/config.props" so that
-'test.uri' equals "jdbc:postgresql://localhost:5432/postgres", and then setup
-the fantest database and user account via the Postgres command line:
-  sudo -u postgres psql
-  postgres=# create role fantest with login superuser password 'fantest';
-  postgres=# alter role fantest with login;
-  postgres=# create schema authorization fantest;
-
 Connections [#connections]
 **************************
 Connections are managed by the `sql::SqlConn` class.  To open and close connections
@@ -65,7 +35,7 @@ the JVM:
 1.  Ensure your JDBC driver is installed and available via
 the system class path.  The best place to stick it is in
 the "jre/lib/ext" directory.  You can use 'fan -version' to
-locate your JRE directory.  For MySQL the driver is packaged
+locate your JRE directory.  The driver is packaged
 up as something like "mysql-connector-j-9.0.0.jar" or "postgresql-42.7.3.jar".
 
 2.  Ensure the JDBC class is loaded into memory.  The simplest way
@@ -213,3 +183,29 @@ The following type specifies the mapping of SQL types to Fantom types:
 
   catch-all      sys::Str
 
+Test Setup [#testSetup]
+***********************
+The unit test 'sql::SqlTest' runs automatically against both mysql and
+postgres. To run this test, both of these DBMS systems must be installed
+locally and running on the default port, and they each must have the following
+one-time configuration applied.
+
+For msyql, setup the fantest database and user account via:
+
+  mysql -u root -p
+  mysql> create user fantest identified by 'fantest';
+  mysql> create database fantest;
+  mysql> grant all privileges on fantest.* to fantest;
+
+For postgres, setup the fantest database and user account via:
+
+  psql -U postgres
+  postgres=# create role fantest with login superuser password 'fantest';
+  postgres=# alter role fantest with login;
+  postgres=# create schema authorization fantest;
+
+In addition, both JDBC drivers must be installed, and "etc/sql/config.props"
+must have a reference to the classpath of both drivers, e.g.
+
+  java.drivers=java.drivers=com.mysql.cj.jdbc.Driver,org.postgresql.Driver
+

src/sql/test/SqlServiceTest.fan → src/sql/test/SqlTest.fan

@@ -7,24 +7,33 @@
 //
 
 **
-** SqlServiceTest (maybe rename from old test)
+** SqlTest
 **
-class SqlServiceTest : Test
+class SqlTest : Test
 {
 
   internal SqlConn? db
   internal DbType? dbType
 
   internal Str? uri
-  internal Str? user
-  internal Str? pass
+  internal const Str user := "fantest"
+  internal const Str pass := "fantest"
 
 //////////////////////////////////////////////////////////////////////////
 // Top
 //////////////////////////////////////////////////////////////////////////
 
   Void test()
   {
+    doTest("jdbc:mysql://localhost:3306/fantest")
+    doTest("jdbc:postgresql://localhost:5432/postgres")
+  }
+
+  private Void doTest(Str testUri)
+  {
+    uri = testUri
+    Log.get("sql").info("SqlTest: testing " + uri)
+
     open
     try
     {
@@ -57,12 +66,6 @@ class SqlServiceTest : Test
 
   Void open()
   {
-    pod  := typeof.pod
-    uri  = pod.config("test.uri")      ?: throw Err("Missing 'sql::test.uri' config prop")
-    user = pod.config("test.username") ?: throw Err("Missing 'sql::test.username' config prop")
-    pass = pod.config("test.password") ?: throw Err("Missing 'sql::test.password' config prop")
-
-    Log.get("sql").info("SqlServiceTest.open " + uri);
     db = SqlConn.open(uri, user, pass)
     verifyEq(db.isClosed, false)