Merge branch 'cjlucas/terminate-connection'

lib/src/connection.cc

@@ -97,3 +97,14 @@ void OracleConnection_changePassword(Dart_NativeArguments args){
 
     Dart_ExitScope();
 }
+
+void OracleConnection_terminate(Dart_NativeArguments args) {
+    Dart_EnterScope();
+
+    auto conn = getThis<std::shared_ptr<Connection>>(args)->get();
+    try {
+        conn->terminate();
+    } CATCH_SQL_EXCEPTION
+
+    Dart_ExitScope();
+}

lib/src/connection.h

@@ -13,18 +13,29 @@ struct Connection {
     occi::Connection *conn;
     std::string username;
     std::string connstr;
+    bool terminated;
 
     Connection(std::shared_ptr<Environment> env,
                std::string username,
                std::string password,
                std::string connStr) : env(env), username{username}, connstr{connStr} {
         conn = env.get()->env->createConnection(username, password, connStr);
+        terminated = false;
+    }
+
+    void terminate() {
+        if (terminated) {
+            return;
+        } 
+
+        terminated = true;
+        env.get()->env->terminateConnection(conn);
     }
 
     ~Connection() {
         //printf("in ~Connection\n");
-        env.get()->env->terminateConnection(conn);
         //printf("Environment use count %ld\n", env.use_count());
+        terminate();
     }
 };
 
@@ -38,3 +49,4 @@ void OracleConnection_rollback(Dart_NativeArguments arguments);
 void OracleConnection_getUsername(Dart_NativeArguments arguments);
 void OracleConnection_getConnectionString(Dart_NativeArguments arguments);
 void OracleConnection_changePassword(Dart_NativeArguments arguments);
+void OracleConnection_terminate(Dart_NativeArguments arguments);

lib/src/occi_extension.cc

@@ -45,6 +45,7 @@ FunctionLookup function_list[] = {
     {"OracleConnection_getUsername", OracleConnection_getUsername},
     {"OracleConnection_getConnectionString", OracleConnection_getConnectionString},
     {"OracleConnection_changePassword", OracleConnection_changePassword},
+    {"OracleConnection_terminate", OracleConnection_terminate},
     {"OracleStatement_getSql", OracleStatement_getSql},
     {"OracleStatement_setSql", OracleStatement_setSql},
     {"OracleStatement_setPrefetchRowCount", OracleStatement_setPrefetchRowCount},

lib/src/occi_extension.dart

@@ -15,6 +15,8 @@ class Environment {
 
   Connection createConnection(String username, String password,
       String connStr) native 'OracleEnvironment_createConnection';
+
+  void terminateConnection(Connection conn) => conn.terminate();
 }
 
 class Connection {
@@ -58,6 +60,7 @@ class Connection {
   String getUsername() native 'OracleConnection_getUsername';
   String getConnectionString() native 'OracleConnection_getConnectionString';
   String changePassword(String oldpass, String newpass) native 'OracleConnection_changePassword';
+  void terminate() native 'OracleConnection_terminate';
 
   void execute(String sql, [List<Object> args]) {
     var stmt = createStatement(sql);

test/complete_test.dart

@@ -36,15 +36,20 @@ main() {
     con.commit();
   });
   test('change password', (){
-    con.changePassword(password, 'dig');
-    var newcon = env.createConnection(username, 'dig', connString);
-    var stmt = newcon.createStatement("SELECT * FROM test_table");
-    var results = stmt.executeQuery();
-    results.next(1);
-    expect(results.getNum(1), equals(34));
+    con.execute('CREATE USER foo IDENTIFIED BY "bar"');
+    con.execute('GRANT CREATE SESSION to foo');
+    var con2 = env.createConnection('foo', 'bar', connString);
+
+    expect(() => con2.changePassword('bar', 'bar2'), returnsNormally);
+    con2.terminate();
+
+    expect(() => con2 = env.createConnection('foo', 'bar2', connString),
+           returnsNormally);
+
+    con2.terminate();
+    con.execute('DROP USER foo');
+  });
 
-    newcon.changePassword('dig', password);
-  }, skip: 'it works, trust me');
   test('get connection properties', (){
       expect(con.getConnectionString(), equals(connString));
       expect(con.getUsername(), equals(username));