WebSVN - OpenConcerto - Diff - Rev 142 and 182 - /trunk/OpenConcerto/src/org/openconcerto/sql/model/SQLSystem.java

 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
- * Copyright 2011 OpenConcerto, by ILM Informatique. All rights reserved.
+ * Copyright 2011-2019 OpenConcerto, by ILM Informatique. All rights reserved.
+ *
  * The contents of this file are subject to the terms of the GNU General Public License Version 3
  * only ("GPL"). You may not use this file except in compliance with the License. You can obtain a
  * copy of the License at http://www.gnu.org/licenses/gpl-3.0.html See the License for the specific
  * language governing permissions and limitations under the License.
  package org.openconcerto.sql.model;
 import org.openconcerto.sql.utils.SQL_URL;
 import org.openconcerto.utils.EnumOrderedSet;
 import org.openconcerto.utils.Tuple2;
+import org.openconcerto.utils.Tuple2.List2;
 import org.openconcerto.utils.cc.ITransformer;
 import java.sql.Statement;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
+import org.h2.engine.ConnectionInfo;
 import org.h2.engine.Constants;
 import org.h2.util.StringUtils;
 /**
  * A RDBMS like PostgreSQL or MySQL.
      * @see <a href="http://www.h2database.com/">H2 site</a>
      */
     H2("H2") {
         private static final String TCP_PREFIX = "tcp://";
-        private static final String SSL_PREFIX = "ssl://";
+        private static final String ARBITRARY_BASE_NAME = "foo";
         ITransformer<String, String> getURLTransf(final SQLServer s) {
             if (s.getSQLSystem() != this)
                 throw new IllegalArgumentException(s + " is not " + this);
             return new ITransformer<String, String>() {
                 @Override
                 public String transformChecked(String base) {
-                    final String sep;
-                    // allow one to use mem for server name
-                    // otherwise just cat name and base
-                    // (eg "tcp://127.0.0.1/" + "sample", "file:~/" + "sample" or "" + "sample" )
-                    if (s.getName().equals("mem"))
-                        sep = ":";
-                    else {
-                        // for file, pass either file:, or file:/someDir/
-                        // jdbc:h2:~/test
-                        sep = "";
-                    }
                     // by default h2 convert database name to upper case (we used to work around it
                     // with SQLSystem.getMDName() but in r2251 an equalsIgnoreCase() was replaced by
                     // equals()) see http://code.google.com/p/h2database/issues/detail?id=204
-                    return s.getName() + sep + base + ";DATABASE_TO_UPPER=false";
+                    return s.getName() + base + ";DATABASE_TO_UPPER=false";
+                }
             };
+        }
         @Override
         public String getServerName(final String host) {
             return TCP_PREFIX + host + "/";
+        }
         @Override
-        public String getHostname(final String server) {
+        public List2<String> getHostnameAndPath(final String server) {
+            // append base name to server name to get a valid value
+            final ConnectionInfo info = new ConnectionInfo(server + ARBITRARY_BASE_NAME);
+            final String name = info.getName();
-            final String prefix;
+            final String hostName;
+            final int pathIndex;
-            if (server.startsWith(TCP_PREFIX))
+            if (info.isRemote()) {
-                prefix = TCP_PREFIX;
+                // tcp:// or ssl://server/path
-            else if (server.startsWith(SSL_PREFIX))
+                assert name.startsWith("//");
+                final int slashIndex = name.indexOf('/', 2);
+                hostName = name.substring(2, slashIndex);
-                prefix = SSL_PREFIX;
+                pathIndex = slashIndex + 1;
-            else
+            } else {
+                // mem: or file:/data/sample or ~/test
-                return null;
+                hostName = null;
+                pathIndex = 0;
+            }
-            // check that our name doesn't contain a path, otherwise we would loose it
+            return new List2<>(hostName, name.substring(pathIndex, name.length() - ARBITRARY_BASE_NAME.length()));
-            // eg dbserv:8084/~/sample
+        }
-            final String hostAndPath = server.substring(prefix.length());
-            final int firstSlash = hostAndPath.indexOf('/');
+        @Override
-            if (firstSlash == hostAndPath.lastIndexOf('/')) {
+        public boolean isPermanent(final String server) {
-                return hostAndPath.substring(0, firstSlash);
+            return !server.startsWith(H2_IN_MEMORY);
-            } else
-                return null;
+        }
         @Override
         public Map<String, String> getConnectionInfo(final String url) {
             final Tuple2<String, Map<String, String>> settings = readSettingsFromURL(url);
             else
                 throw e;
+        }
+    }
+    public static final String H2_IN_MEMORY = "mem:";
     private final String label;
     private final EnumOrderedSet<HierarchyLevel> levels;
     private SQLSystem(final String label) {
         this.label = label;
+    }
     /**
      * The host name for the passed server.
+     *
-     * @param server the name of an {@link SQLServer}.
+     * @param server the name of an {@link SQLServer}, e.g. tcp://127.0.0.1/dir/.
-     * @return its host or <code>null</code> if <code>server</code> has no host or is too complex
+     * @return its host and its path, both can be <code>null</code> (but not at the same time), e.g.
-     *         (eg tcp://127.0.0.1/a/b/c).
+     *         [127.0.0.1, dir].
+     */
+    public List2<String> getHostnameAndPath(String server) {
+        Objects.requireNonNull(server, "Null server");
+        return new List2<>(server, null);
+    }
+    /**
+     * Whether the passed server runs inside the VM.
+     *
+     * @param server a server, e.g. {@link SQLServer#getName()}.
+     * @return <code>true</code> if <code>server</code> runs inside the VM.
+     */
+    public final boolean isEmbedded(final String server) {
+        return getHostnameAndPath(server).get0() == null;
+    }
+    /**
+     * Whether the passed server survives when all connections to it are closed.
+     *
+     * @param server a server, e.g. {@link SQLServer#getName()}.
+     * @return <code>true</code> if <code>server</code> survives when all connections to it are
+     *         closed.
      */
-    public String getHostname(String server) {
+    public boolean isPermanent(String server) {
-        return server;
+        return true;
+    }
     /**
      * Parse <code>url</code> to find info needed by {@link SQL_URL}.
+     *

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/sql/model/SQLSystem.java - Rev 142 → 182