missing file, and restore (undocumented) split script functionality

Author: Koen Deforche

examples/feature/dbo/tutorial6.C

@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2010 Emweb bvba, Kessel-Lo, Belgium.
+ *
+ * See the LICENSE file for terms of use.
+ */
+
+/*****
+ * This file is part of the Wt::Dbo tutorial:
+ * http://www.webtoolkit.eu/wt/doc/tutorial/dbo/tutorial.html
+ *****/
+
+/*****
+ * Dbo tutorial section 7.5
+ *  Specifying a natural primary key that is also a foreign key
+ *****/
+
+#include <Wt/Dbo/Dbo>
+#include <Wt/Dbo/backend/Sqlite3>
+
+namespace dbo = Wt::Dbo;
+
+class UserInfo;
+class User;
+
+namespace Wt {
+  namespace Dbo {
+
+    template<>
+    struct dbo_traits<UserInfo> : public dbo_default_traits {
+      typedef ptr<User> IdType;
+
+      static IdType invalidId() {
+        return ptr<User>();
+      }
+
+      static const char *surrogateIdField() { return 0; }
+    };
+
+  }
+}
+
+class User {
+public:
+  std::string name;
+
+  dbo::collection< dbo::ptr<UserInfo> > infos;
+
+  template<class Action>
+  void persist(Action& a)
+  {
+    dbo::field(a, name, "name");
+
+    // In fact, this is really constrained to hasOne() ...
+    dbo::hasMany(a, infos, dbo::ManyToOne, "user");
+  }
+};
+
+class UserInfo {
+public:
+  dbo::ptr<User> user;
+  std::string info;
+
+  template<class Action>
+  void persist(Action& a)
+  {
+    dbo::id(a, user, "user", dbo::OnDeleteCascade);
+    dbo::field(a, info, "info");
+  }
+};
+
+void run()
+{
+  /*
+   * Setup a session, would typically be done once at application startup.
+   */
+  dbo::backend::Sqlite3 sqlite3(":memory:");
+  sqlite3.setProperty("show-queries", "true");
+  dbo::Session session;
+  session.setConnection(sqlite3);
+
+  session.mapClass<User>("user");
+  session.mapClass<UserInfo>("user_info");
+
+  /*
+   * Try to create the schema (will fail if already exists).
+   */
+  session.createTables();
+
+  dbo::Transaction transaction(session);
+
+  {
+    User *user = new User();
+    user->name = "Joe";
+
+    dbo::ptr<User> userPtr = session.add(user);
+
+    UserInfo *userInfo = new UserInfo();
+    userInfo->user = userPtr;
+    userInfo->info = "great guy";
+
+    session.add(userInfo);
+
+    transaction.commit();
+  }
+
+  {
+    dbo::Transaction transaction(session);
+
+    dbo::ptr<UserInfo> info = session.find<UserInfo>();
+    
+    std::cerr << info->user->name << " is a " << info->info << std::endl;
+
+    transaction.commit();
+  }
+}
+
+int main(int argc, char **argv)
+{
+  run();
+}

src/web/skeleton/Boot.js

@@ -153,7 +153,7 @@ _$_$if_SPLIT_SCRIPT_$_();
     /* Ideally, we should be able to omit the sessionid too */
     loadScript(selfUrl + allInfo + '&request=script&skeleton=true',
                function() {
-                 loadScript(selfUrl +
+                 loadScript(selfUrl + allInfo
                             + '&request=script&rand=' + rand(), null);
                });
 _$_$endif_$_();

src/web/skeleton/Boot.min.js

@@ -232,9 +232,8 @@
 
 	   Log the response time for each HTTP request or websocket
 	   message (to stderr). This includes the time to parse the
-	   request parameters and body, generate the result, and send
-	   it to the client (so it will depend also on the distance to
-	   the client).
+	   request parameters and body, generate the result, but
+	   excludes time spent in HTTP I/O.
 	  -->
 	<log-response-time>false</log-response-time>