[PHPLIB-DEV] cvs commit From: kir (phplib-dev <email protected>)
Date: 12/15/99

From: kir
Date: Wed Dec 15 11:54:53 1999
Added files:
      php-lib/php/ct_oracle.inc

Modified files:
      php-lib/CHANGES
      php-lib/php/db_oracle.inc
      php-lib/php/session.inc
      php-lib/stuff/create_database.oracle

Log message:

  Some work on ct_oracle.inc. See CHANGES file.

Index: php-lib/CHANGES
diff -u php-lib/CHANGES:1.152 php-lib/CHANGES:1.153
--- php-lib/CHANGES:1.152 Sun Dec 12 17:29:51 1999
+++ php-lib/CHANGES Wed Dec 15 11:54:49 1999
@@ -1,4 +1,11 @@
-$Id: CHANGES,v 1.152 1999/12/12 16:29:51 padraic Exp $
+$Id: CHANGES,v 1.153 1999/12/15 10:54:49 kir Exp $
+
+15-Dec-1999 kir
+ - Modelled ct_oracle.inc after ct_mysql.inc and ct_split_sql.inc
+ - functions begin_transaction() and end_transaction() for db_oracle.inc
+ (needed by ct_oracle.inc)
+ - create_database.oracle change LONG->VARCHAR(2000) in active_session.inc
+ - swap release_lock and ac_store in freeze function in session.inc
 
 12-Dec-1999 padraic
   - cleaned up, documented... the title feature of in
Index: php-lib/php/db_oracle.inc
diff -u php-lib/php/db_oracle.inc:1.20 php-lib/php/db_oracle.inc:1.21
--- php-lib/php/db_oracle.inc:1.20 Tue Dec 14 06:54:24 1999
+++ php-lib/php/db_oracle.inc Wed Dec 15 11:54:49 1999
@@ -4,7 +4,7 @@
  *
  * Copyright (c) 1998,1999 Luis Francisco Gonzalez Hernandez
  *
- * $Id: db_oracle.inc,v 1.20 1999/12/14 05:54:24 ssilk Exp $
+ * $Id: db_oracle.inc,v 1.21 1999/12/15 10:54:49 kir Exp $
  *
  */
 
@@ -483,5 +483,44 @@
    }
   return $info;
   }
+
+
+ // Some transaction support
+ // Methods are used in ct_oracle.inc
+ function begin_transaction()
+ {
+ $this->connect();
+ // Now, disable autocommit
+ Ora_CommitOff($this->Link_ID);
+ if ($this->Debug)
+ {
+ print "BEGIN TRANSACTION<BR>";
+ }
+ }
+ function end_transaction()
+ {
+ if ($this->Debug)
+ {
+ print "BEGIN TRANSACTION<BR>";
+ }
+
+ $res = 1;
+ if(! <email protected>($this->Link_ID))
+ {
+ Ora_CommitOn($this->Link_ID);
+ $this->halt("Unable to finish transaction");
+ $res = 0;
+ }
+ // Enable autocommit again
+ Ora_CommitOn($this->Link_ID);
+
+ if ($this->Debug)
+ {
+ print "END TRANSACTION : $res<BR>";
+ }
+ return $res;
+ }
+
+
 }
 ?>
Index: php-lib/php/session.inc
diff -u php-lib/php/session.inc:1.56 php-lib/php/session.inc:1.57
--- php-lib/php/session.inc:1.56 Sat Nov 13 22:48:05 1999
+++ php-lib/php/session.inc Wed Dec 15 11:54:50 1999
@@ -5,7 +5,7 @@
  * Copyright (c) 1998,1999 NetUSE GmbH
  * Boris Erdmann, Kristian Koehntopp
  *
- * $Id: session.inc,v 1.56 1999/11/13 21:48:05 padraic Exp $
+ * $Id: session.inc,v 1.57 1999/12/15 10:54:50 kir Exp $
  *
  */
 
@@ -347,8 +347,12 @@
       }
     }
     
- $r = $this->that->ac_store($this->id, $this->name, $str);
+ // We can't have session records locked and update them
+ // in the same time. So first We have to release lock
+ // and then store/update session data. [kir]
     $this->release_lock();
+ $r = $this->that->ac_store($this->id, $this->name, $str);
+
     if(!$r) $this->that->ac_halt("Session: freeze() failed.");
   }
 
Index: php-lib/stuff/create_database.oracle
diff -u php-lib/stuff/create_database.oracle:1.11 php-lib/stuff/create_database.oracle:1.12
--- php-lib/stuff/create_database.oracle:1.11 Fri Nov 12 08:11:26 1999
+++ php-lib/stuff/create_database.oracle Wed Dec 15 11:54:51 1999
@@ -3,7 +3,7 @@
 -- Nom de SGBD : ORACLE Version 7.x
 -- Date de cr‚ation : 9/24/98 10:49 AM
 -- ============================================================
--- $Id: create_database.oracle,v 1.11 1999/11/12 07:11:26 kk Exp $
+-- $Id: create_database.oracle,v 1.12 1999/12/15 10:54:51 kir Exp $
 --
 -- Update: should also work on 8.x
 
@@ -16,7 +16,7 @@
     P_NAME VARCHAR2(32) not null,
     P_VALPOS VARCHAR2(6) not null,
     P_VALENC VARCHAR(16) not null,
- P_VAL LONG null ,
+ P_VAL VARCHAR(2000) null ,
     P_CHANGED VARCHAR2(14) not null,
     constraint PK_ACTIVE_SESSIONS primary key (P_NAME, P_SID, P_VALPOS)
 )

-
PHPLIB Developers Mailing List. Send messages to <phplib-dev <email protected>>.
To unsubscribe, send "unsubscribe" to <phplib-dev-request <email protected>> in
the body, not the subject, of your message.