__Conn -> connection

DSoftOut · Feb 27, 2018 · dabf2ae · dabf2ae
1 parent 055c8ef
commit dabf2ae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/source/app.d b/source/app.d
@@ -91,7 +91,7 @@ int main(string[] args)
         };
 
         // delegate
-        void afterConnectOrReconnect(__Conn conn)
+        void afterConnectOrReconnect(Connection conn)
         {
             if(prepArgs.methodsLoadedFlag)
             {
@@ -134,7 +134,7 @@ int main(string[] args)
             // prepare statements for previously used connection
             afterConnectOrReconnect(conn);
 
-            delete conn;
+            destroy(conn);
         }
 
         if(!checkStatements)
@@ -840,7 +840,7 @@ class LoopException : Exception
 }
 
 /// returns names of unprepared methods, but length is number of unprepared statements
-private string[] prepareStatements(__Conn conn, ref PrepareStatementsArgs args)
+private string[] prepareStatements(Connection conn, ref PrepareStatementsArgs args)
 {
     {
         logDebugV("try to prepare internal statements");
@@ -902,7 +902,7 @@ string preparedName(in Method method, in Statement statement)
     }
 }
 
-private OidType[] retrieveArgsTypes(__Conn conn, string preparedStatementName)
+private OidType[] retrieveArgsTypes(Connection conn, string preparedStatementName)
 {
     auto desc = conn.describePreparedStatement(preparedStatementName);
 

diff --git a/source/sql_transaction.d b/source/sql_transaction.d
@@ -12,7 +12,7 @@ struct TransactionQueryParams
 
 struct SQLTransaction
 {
-    private LockedConnection!__Conn conn;
+    private LockedConnection conn;
     private bool opened = false;
 
     @disable this(this){}
@@ -49,7 +49,7 @@ struct SQLTransaction
         if(opened)
             execBuiltIn(BuiltInPrep.ROLLBACK);
 
-        delete conn;
+        destroy(conn);
     }
 
     immutable(Answer)[] execMethod(in Method method, TransactionQueryParams qp)