Thies, please check the function names and descriptions.

1 files changed, 71 insertions, 33 deletions

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 699c560b17..3a5eee5c18 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -2356,7 +2356,7 @@ static void oci_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent,int exclu
 
 /************************* EXTENSION FUNCTIONS *************************/
 
-/* {{{ proto int OCIDefineByName(int stmt, string name, mixed &var [, int type])
+/* {{{ proto int ocidefinebyname(int stmt, string name, mixed &var [, int type])
    Define a PHP variable to an Oracle column by name */
 /* if you want to define a LOB/CLOB etc make sure you allocate it via OCINewDescriptor BEFORE defining!!!
  */
@@ -2414,7 +2414,8 @@ PHP_FUNCTION(ocidefinebyname)
 }
 
 /* }}} */
-/* {{{ proto int OCIBindByName(int stmt, string name, mixed &var, int maxlength [, int type])
+
+/* {{{ proto int ocibindbyname(int stmt, string name, mixed &var, int maxlength [, int type])
    Bind a PHP variable to an Oracle placeholder by name */
 /* if you want to bind a LOB/CLOB etc make sure you allocate it via OCINewDescriptor BEFORE binding!!!
  */
@@ -2535,6 +2536,7 @@ PHP_FUNCTION(ocibindbyname)
 }
 
 /* }}} */
+
 /* {{{ proto string ocifreedesc(object lob)
    Deletes large object description */
 
@@ -2556,6 +2558,7 @@ PHP_FUNCTION(ocifreedesc)
   RETURN_FALSE;
 }
 /* }}} */
+
 /* {{{ proto string ocisavelob(object lob)
    Saves a large object */
 
@@ -2645,6 +2648,7 @@ PHP_FUNCTION(ocisavelob)
 }
 
 /* }}} */
+
 /* {{{ proto string ocisavelobfile(object lob)
    Saves a large object file */
 
@@ -2724,6 +2728,7 @@ PHP_FUNCTION(ocisavelobfile)
 }
 
 /* }}} */
+
 /* {{{ proto string ociloadlob(object lob)
    Loads a large object */
 
@@ -2753,6 +2758,7 @@ PHP_FUNCTION(ociloadlob)
   RETURN_FALSE;
 }
 /* }}} */
+
 /* {{{ proto void ociwritelobtofile(object lob [, string filename] [, int start] [, int length])
    Writes a large object into a file */
 
@@ -2933,7 +2939,8 @@ PHP_FUNCTION(ociwritelobtofile)
 	RETURN_FALSE;
 }
 /* }}} */
-/* {{{ proto string OCINewDescriptor(int connection [, int type ])
+
+/* {{{ proto string ocinewdescriptor(int connection [, int type])
    Initialize a new empty descriptor LOB/FILE (LOB is default) */
 
 PHP_FUNCTION(ocinewdescriptor)
@@ -2963,7 +2970,8 @@ PHP_FUNCTION(ocinewdescriptor)
 }
 
 /* }}} */
-/* {{{ proto string OCIRollback(int conn)
+
+/* {{{ proto string ocirollback(int conn)
    Rollback the current context */
 
 PHP_FUNCTION(ocirollback)
@@ -2991,7 +2999,8 @@ PHP_FUNCTION(ocirollback)
 }
 
 /* }}} */
-/* {{{ proto string OCICommit(int conn)
+
+/* {{{ proto string ocicommit(int conn)
    Commit the current context */
 
 PHP_FUNCTION(ocicommit)
@@ -3023,7 +3032,8 @@ PHP_FUNCTION(ocicommit)
 }
 
 /* }}} */
-/* {{{ proto string OCIColumnName(int stmt, int col)
+
+/* {{{ proto string ocicolumnname(int stmt, int col)
    Tell the name of a column */
 
 PHP_FUNCTION(ocicolumnname)
@@ -3047,7 +3057,8 @@ PHP_FUNCTION(ocicolumnname)
 }
 
 /* }}} */
-/* {{{ proto int OCIColumnSize(int stmt, int col)
+
+/* {{{ proto int ocicolumnsize(int stmt, int col)
    Tell the maximum data size of a column */
 
 PHP_FUNCTION(ocicolumnsize)
@@ -3079,7 +3090,8 @@ PHP_FUNCTION(ocicolumnsize)
 }
 
 /* }}} */
-/* {{{ proto int OCIColumnScale(int stmt, int col)
+
+/* {{{ proto int ocicolumnscale(int stmt, int col)
    Tell the scale of a column */
 
 PHP_FUNCTION(ocicolumnscale)
@@ -3102,7 +3114,8 @@ PHP_FUNCTION(ocicolumnscale)
 }
 
 /* }}} */
-/* {{{ proto int OCIColumnPrecision(int stmt, int col)
+
+/* {{{ proto int ocicolumnprecision(int stmt, int col)
    Tell the precision of a column */
 
 PHP_FUNCTION(ocicolumnprecision)
@@ -3125,7 +3138,8 @@ PHP_FUNCTION(ocicolumnprecision)
 }
 
 /* }}} */
-/* {{{ proto mixed  OCIColumnType(int stmt, int col)
+
+/* {{{ proto mixed  ocicolumntype(int stmt, int col)
    Tell the data type of a column */
 
 PHP_FUNCTION(ocicolumntype)
@@ -3187,7 +3201,8 @@ PHP_FUNCTION(ocicolumntype)
 }
 
 /* }}} */
-/* {{{ proto mixed  OCIColumnTypeRaw(int stmt, int col)
+
+/* {{{ proto mixed  ocicolumntyperaw(int stmt, int col)
    Tell the raw oracle data type of a column */
 
 PHP_FUNCTION(ocicolumntyperaw)
@@ -3210,7 +3225,8 @@ PHP_FUNCTION(ocicolumntyperaw)
 }
 
 /* }}} */
-/* {{{ proto int OCIColumnIsNULL(int stmt, int col)
+
+/* {{{ proto int ocicolumnisnull(int stmt, int col)
    Tell whether a column is NULL */
 
 PHP_FUNCTION(ocicolumnisnull)
@@ -3237,7 +3253,8 @@ PHP_FUNCTION(ocicolumnisnull)
 }
 
 /* }}} */
-/* {{{ proto void OCIDebug(int onoff)
+
+/* {{{ proto void ocidebug(int onoff)
    Toggle internal debugging output for the OCI extension */
 
 /* Disables or enables the internal debug output.
@@ -3257,7 +3274,8 @@ PHP_FUNCTION(ociinternaldebug)
 
 
 /* }}} */
-/* {{{ proto int OCIExecute(int stmt [, int mode])
+
+/* {{{ proto int ociexecute(int stmt [, int mode])
    Execute a parsed statement */
 
 PHP_FUNCTION(ociexecute)
@@ -3285,7 +3303,8 @@ PHP_FUNCTION(ociexecute)
 }
 
 /* }}} */
-/* {{{ proto int OCICancel(int stmt)
+
+/* {{{ proto int ocicancel(int stmt)
    Prepare a new row of data for reading */
 
 PHP_FUNCTION(ocicancel)
@@ -3307,7 +3326,8 @@ PHP_FUNCTION(ocicancel)
 }
 
 /* }}} */
-/* {{{ proto int OCIFetch(int stmt)
+
+/* {{{ proto int ocifetch(int stmt)
    Prepare a new row of data for reading */
 
 PHP_FUNCTION(ocifetch)
@@ -3330,7 +3350,8 @@ PHP_FUNCTION(ocifetch)
 }
 
 /* }}} */
-/* {{{ proto int OCIFetchInto(int stmt, array &output [, int mode])
+
+/* {{{ proto int ocifetchinto(int stmt, array &output [, int mode])
    Fetch a row of result data into an array */
 
 PHP_FUNCTION(ocifetchinto)
@@ -3397,7 +3418,8 @@ PHP_FUNCTION(ocifetchinto)
 }
 
 /* }}} */
-/* {{{ proto int OCIFetchStatement(int stmt, array &output)
+
+/* {{{ proto int ocifetchstatement(int stmt, array &output)
    Fetch all rows of result data into an array */
 
 PHP_FUNCTION(ocifetchstatement)
@@ -3462,7 +3484,8 @@ PHP_FUNCTION(ocifetchstatement)
 }
 
 /* }}} */
-/* {{{ proto int OCIFreeStatement(int stmt)
+
+/* {{{ proto int ocifreestatement(int stmt)
    Free all resources associated with a statement */
 
 PHP_FUNCTION(ocifreestatement)
@@ -3482,7 +3505,8 @@ PHP_FUNCTION(ocifreestatement)
 }
 
 /* }}} */
-/* {{{ proto int OCILogoff(int conn)
+
+/* {{{ proto int ocilogoff(int conn)
    Disconnect from database */
 
 PHP_FUNCTION(ocilogoff)
@@ -3517,7 +3541,8 @@ PHP_FUNCTION(ocilogoff)
 }
 
 /* }}} */
-/* {{{ proto int OCINLogon(string user, string pass [, string db])
+
+/* {{{ proto int ocinlogon(string user, string pass [, string db])
    Connect to an Oracle database and log on. returns a new session */
 
 /* Connects to an Oracle 8 database and logs on.  If the
@@ -3530,8 +3555,9 @@ PHP_FUNCTION(ocinlogon)
 }
 
 /* }}} */
-/* {{{ proto int    OCILogon(string user, string pass[, string db])
-  Connect to an Oracle database and log on. returns a new session.
+
+/* {{{ proto int ocilogon(string user, string pass [, string db])
+   Connect to an Oracle database and log on. Returns a new session.
  */
 
 /* Connects to an Oracle 8 database and logs on.  If the
@@ -3544,7 +3570,8 @@ PHP_FUNCTION(ocilogon)
 }
 
 /* }}} */
-/* {{{ proto int OCIPLogon(string user, string pass [, string db])
+
+/* {{{ proto int ociplogon(string user, string pass [, string db])
    Connect to an Oracle database using a persistent connection and log on. Returns a new session. */
 
 /* Connects to an Oracle 8 database and logs on.  If the
@@ -3557,7 +3584,8 @@ PHP_FUNCTION(ociplogon)
 }
 
 /* }}} */
-/* {{{ proto int OCIError([int stmt|conn|global])
+
+/* {{{ proto int ocierror([int stmt|conn|global])
    Return the last error of stmt|conn|global. If no error happened returns false. */
 
 PHP_FUNCTION(ocierror)
@@ -3610,7 +3638,8 @@ PHP_FUNCTION(ocierror)
 }
 
 /* }}} */
-/* {{{ proto int OCINumCols(int stmt)
+
+/* {{{ proto int ocinumcols(int stmt)
    Return the number of result columns in a statement */
 
 PHP_FUNCTION(ocinumcols)
@@ -3628,7 +3657,8 @@ PHP_FUNCTION(ocinumcols)
 }
 
 /* }}} */
-/* {{{ proto int OCIParse(int conn, string query)
+
+/* {{{ proto int ociparse(int conn, string query)
    Parse a query and return a statement */
 
 PHP_FUNCTION(ociparse)
@@ -3651,8 +3681,9 @@ PHP_FUNCTION(ociparse)
 }
 
 /* }}} */
-/* {{{ proto int OCIParse(int conn, string query)
-   Parse a query and return a statement */
+
+/* {{{ proto int ocisetprefetch(int conn, string query)
+   Set a prefetch query??? */
 
 PHP_FUNCTION(ocisetprefetch)
 {
@@ -3673,7 +3704,8 @@ PHP_FUNCTION(ocisetprefetch)
 }
 
 /* }}} */
-/* {{{ proto int OCINewCursor(int conn)
+
+/* {{{ proto int ocinewcursor(int conn)
    Return a new cursor (Statement-Handle) - use this to bind ref-cursors! */
 
 PHP_FUNCTION(ocinewcursor)
@@ -3694,7 +3726,8 @@ PHP_FUNCTION(ocinewcursor)
 }
 
 /* }}} */
-/* {{{ proto string OCIResult(int stmt, mixed column)
+
+/* {{{ proto string ociresult(int stmt, mixed column)
    Return a single column of result data */
 
 PHP_FUNCTION(ociresult)
@@ -3719,7 +3752,8 @@ PHP_FUNCTION(ociresult)
 }
 
 /* }}} */
-/* {{{ proto string OCIServerVersion(int conn)
+
+/* {{{ proto string ociserverversion(int conn)
    Return a string containing server version information */
 
 PHP_FUNCTION(ociserverversion)
@@ -3750,7 +3784,8 @@ PHP_FUNCTION(ociserverversion)
 }
 
 /* }}} */
-/* {{{ proto int OCIStatementType(int stmt)
+
+/* {{{ proto int ocistatementtype(int stmt)
    Return the query type of an OCI statement */
  
 /* XXX it would be better with a general interface to OCIAttrGet() */
@@ -3812,6 +3847,9 @@ PHP_FUNCTION(ocistatementtype)
 	}
 }
 
+/* {{{ proto int ocirowcount(int stmt)
+   Return the row count of an OCI statement */
+
 PHP_FUNCTION(ocirowcount)
 {
 	zval **stmt;