Changeset 9557

Timestamp:

03/31/09 13:54:21 (1 year ago)

Author:

hannes

Message:

Add static getCollection() method on HopObject constructors to generate collections programmatically and on the fly. Implement limit and offset collection properties for databases that support it (Postgresql + Mysql)

Files:

• helma/helma/trunk/src/helma/objectmodel/db/DbMapping.java (modified) (10 diffs)
• helma/helma/trunk/src/helma/objectmodel/db/Relation.java (modified) (17 diffs)
• helma/helma/trunk/src/helma/scripting/rhino/HopObjectCtor.java (modified) (3 diffs)
• helma/helma/trunk/src/helma/scripting/rhino/RhinoCore.java (modified) (7 diffs)

helma/helma/trunk/src/helma/objectmodel/db/DbMapping.java

@@ -37 +37 @@
-
-    // properties from where the mapping is read
-Resource
+
-
-    // name of data dbSource to which this mapping writes
@@ -148 +148 @@
-     * Create a DbMapping from a type.properties property file
-     */
-Resource
+
-        this.app = app;
-        // create a unique instance of the string. This is useful so
@@ -170 +170 @@
-     */
-    public boolean needsUpdate() {
-
+
+
+
+
-    }
-
@@ -234 +237 @@
-        }
-
-
+
+
-
-        // see if this prototype extends (inherits from) any other prototype
@@ -299 +303 @@
-        ArrayList joinList = new ArrayList();
-
-Enumeration e = props.keys(); e.hasMoreElements();
-String propName = (String) e.nextElemen
+Iterator it = props.entrySet().iterator(); it.hasNext(); 
+Map.Entry entry =  (Map.Entry) it.nex
-
-            try {
+                String propName = (String) entry.getKey();
+
-                // ignore internal properties (starting with "_") and sub-options (containing a ".")
-                if (!propName.startsWith("_") && (propName.indexOf(".") < 0)) {
-String dbField = props.getProperty(propName
+Object propValue = entry.getValue(
-
-                    // check if a relation for this propery already exists. If so, reuse it
@@ -314 +320 @@
-                    }
-
-dbField, props
+propValue, getSubProperties(propName)
-                    p2d.put(propName, rel);
-
@@ -355 +361 @@
-        joins = (Relation[]) joinList.toArray(joins);
-
-String subnodeMapping = props.getProperty
+Object subnodeMapping = props.get
-
-        if (subnodeMapping != null) {
@@ -364 +370 @@
-                }
-
-props
+getSubProperties("_children")
-
-                // if subnodes are accessed via access name or group name,
@@ -397 +403 @@
-    private void registerExtension(String extID, String extName) {
-        // lazy initialization of extensionMap
+        if (extID == null) {
+            return;
+        }
-        if (extensionMap == null) {
-            extensionMap = new ResourceProperties();
@@ -1470 +1479 @@
-     * @return our properties
-     */
-Resource
+
-        return props;
+    }
+
+    public Properties getSubProperties(String prefix) {
+        if (props.get(prefix) instanceof Properties) {
+            return (Properties) props.get(prefix);
+        } else if (props instanceof ResourceProperties) {
+            return ((ResourceProperties) props).getSubProperties(prefix + ".");
+        } else {
+            Properties subprops = new Properties();
+            prefix = prefix + ".";
+            Iterator it = props.entrySet().iterator();
+            int prefixLength = prefix.length();
+            while (it.hasNext()) {
+                Map.Entry entry = (Map.Entry) it.next();
+                String key = entry.getKey().toString();
+                if (key.regionMatches(false, 0, prefix, 0, prefixLength)) {
+                    subprops.put(key.substring(prefixLength), entry.getValue());
+                }
+            }
+            return subprops;
+        }
-    }
-

helma/helma/trunk/src/helma/objectmodel/db/Relation.java

@@ -103 +103 @@
-    Vector filterPropertyRefs;
-    int maxSize = 0;
+    int offset = 0;
-
-    /**
@@ -124 +125 @@
-        this.queryHints =               rel.queryHints;
-        this.maxSize =                  rel.maxSize;
+        this.offset =                   rel.offset;
-        this.constraints =              rel.constraints;
-        this.accessName =               rel.accessName;
@@ -145 +147 @@
-    // parse methods for new file format
-    ////////////////////////////////////////////////////////////////////////////////////////////
-String desc, Resource
+Object desc, 
-        Application app = ownType.getApplication();
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            } else {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        // the following options only apply to object and collection relations
@@ -211 +193 @@
-            Vector newConstraints = new Vector();
-
-config
+props
-
-            constraints = new Constraint[newConstraints.size()];
@@ -257 +239 @@
-    }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        aggressiveLoading = (loading != null) &&
-                            "aggressive".equalsIgnoreCase(loading.trim());
-
-config
+props
-
-        aggressiveCaching = (caching != null) &&
@@ -269 +303 @@
-
-        // get order property
-config
+props
-
-        if ((order != null) && (order.trim().length() == 0)) {
@@ -276 +310 @@
-
-        // get the criteria(s) for updating this collection
-config
+props
-
-        // get the autosorting flag
-config
+props
-
-        // get additional filter property
-config
+props
-
-        if (filter != null) {
@@ -305 +339 @@
-
-        // get additional tables
-config
+props
-
-        if (additionalTables != null) {
@@ -335 +369 @@
-
-        // get query hints
-config
+props
-
-        // get max size of collection
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-        // get group by property
-config
+props
-
-        if ((groupby != null) && (groupby.trim().length() == 0)) {
@@ -358 +387 @@
-
-        if (groupby != null) {
-config
+props
-
-            if ((groupbyOrder != null) && (groupbyOrder.trim().length() == 0)) {
@@ -364 +393 @@
-            }
-
-config
+props
-
-            if ((groupbyPrototype != null) && (groupbyPrototype.trim().length() == 0)) {
@@ -375 +404 @@
-
-        // check if subnode condition should be applied for property relations
-config
+props
-
-        // parse contstraints
-config
-config
+props
+props
-
-        if ((local != null) && (foreign != null)) {
@@ -388 +417 @@
-        // parse additional contstraints from *.1 to *.9
-        for (int i=1; i<10; i++) {
-config
-config
+props
+props
-
-            if ((local != null) && (foreign != null)) {
@@ -398 +427 @@
-        // parse constraints logic
-        if (cnst.size() > 1) {
-config
+props
-            if ("and".equalsIgnoreCase(logic)) {
-                logicalOperator = AND;
@@ -414 +443 @@
-    }
-
+    private int getIntegerProperty(String name, Properties props, int defaultValue) {
+        Object value = props.get(name);
+
+        if (value instanceof Number) {
+            return ((Number) value).intValue();
+        } else if (value instanceof String) {
+            return Integer.parseInt((String) value);
+        }
+        return defaultValue;
+    }
+
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
@@ -419 +459 @@
-     * Get the configuration properties for this relation.
-     */
-ResourceProperties
-Properties().get
+Map
+
-    }
-
@@ -874 +914 @@
-        } else if (useOrder && (order != null)) {
-            q.append(" ORDER BY ").append(order);
+        }
+
+        if (maxSize > 0 && !ownType.isOracle()) {
+            q.append(" LIMIT ").append(maxSize);
+            if (offset > 0) {
+                q.append(" OFFSET ").append(offset);
+            }
-        }
-

helma/helma/trunk/src/helma/scripting/rhino/HopObjectCtor.java

@@ -18 +18 @@
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
+import java.util.Properties;
-
-import helma.objectmodel.INode;
@@ -59 +60 @@
-        addAsConstructor(core.global, prototype);
-        defineProperty("getById", new GetById(core.global), attr);
+        defineProperty("getCollection", new HopCollection(core.global), attr);
-    }
-
@@ -181 +183 @@
-    }
-
+    class HopCollection extends BaseFunction {
+
+        public HopCollection(Scriptable scope) {
+            ScriptRuntime.setFunctionProtoAndParent(this, scope);
+        }
+
+        public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] args) {
+            if (args.length != 1) {
+                throw new IllegalArgumentException("Wrong number of arguments in definePrototype()");
+            }
+            if (!(args[0] instanceof Scriptable)) {
+                throw new IllegalArgumentException("Second argument to HopObject.definePrototype() must be Object");
+            }
+
+            Scriptable desc = (Scriptable) args[0];
+            Properties childmapping = core.scriptableToProperties(desc);
+            if (!childmapping.containsKey("collection")) {
+                // if contained type isn't defined explicitly limit collection to our own type
+                childmapping.put("collection", HopObjectCtor.this.getFunctionName());
+            }
+
+            Node node = new Node("HopQuery", null, core.app.getWrappedNodeManager());
+            Properties props = new Properties();
+            props.put("_children", childmapping);
+            DbMapping dbmap = new DbMapping(core.app, null, props);
+            dbmap.update();
+            node.setDbMapping(dbmap);
+            node.setState(Node.VIRTUAL);
+            return new HopObject("HopQuery", core, node, core.hopObjectProto);
+        }
+
+        public int getArity() {
+            return 1;
+        }
+
+        public int getLength() {
+            return 1;
+        }
+    }
+
-}

helma/helma/trunk/src/helma/scripting/rhino/RhinoCore.java

@@ -24 +24 @@
-import helma.objectmodel.db.DbMapping;
-import helma.scripting.*;
-
-
-
-
+
-import org.mozilla.javascript.*;
-import org.mozilla.javascript.tools.debugger.ScopeProvider;
@@ -217 +214 @@
-     *  @param prototype the prototype to be created
-     */
-ivate synchronized void
+otected synchronized TypeInfo
-
-        String name = prototype.getName();
@@ -237 +234 @@
-                op = new HopObject(name, this);
-            }
-
+type = 
-        }
-
@@ -251 +248 @@
-            }
-        }
+
+        return type;
-    }
-
@@ -292 +291 @@
-     *  @param type the prototype object info
-     */
-ivate
+otected
-        String name = prototype.getName();
-        String lowerCaseName = prototype.getLowerCaseName();
@@ -434 +433 @@
-        TypeInfo type = getPrototypeInfo(protoName);
-        SystemMap map = new SystemMap();
-   
+
-        while(it.hasNext()) {
-            Object key = it.next();
@@ -748 +747 @@
-        return href;
-    }
+
+
+    Properties scriptableToProperties(Scriptable obj) {
+        Object[] ids = obj.getIds();
+        Properties props = new ResourceProperties(app, null, null, true);
+        for (int i = 0; i < ids.length; i++) {
+            // we ignore non-string keys
+            if (ids[i] instanceof String) {
+                String key = (String) ids[i];
+                Object value = obj.get(key, obj);
+                if (value == Undefined.instance || value == Scriptable.NOT_FOUND) {
+                    value = null;
+                } else if (value instanceof Scriptable) {
+                    value = scriptableToProperties((Scriptable) value);
+                }
+                props.put(key, value);
+            }
+        }
+        return props;
+    }    
-
-    /**