MDL-14966 Moved moodle_recordset to separate class into lib/dml

diff --git a/lib/dml/adodb_moodle_recordset.php b/lib/dml/adodb_moodle_recordset.php
index e69680e9f23cc8bbe6acb4e5f0da07d9ff3d1f4e..54af15ce3d299e1eeac45285d023d3724a838da2 100644 (file)
--- a/lib/dml/adodb_moodle_recordset.php
+++ b/lib/dml/adodb_moodle_recordset.php
@@ -1,10 +1,12 @@
-<?php
+<?php  //$Id$
+
+require_once($CFG->libdir.'/dml/moodle_recordset.php');
 
 /**
  * Adodb basic moodle recordset class
  * @package dmlib
  */
-class adodb_moodle_recordset implements moodle_recordset {
+class adodb_moodle_recordset extends moodle_recordset {
     private $rs;
 
     public function __construct($rs) {

diff --git a/lib/dml/moodle_recordset.php b/lib/dml/moodle_recordset.php
new file mode 100644 (file)
index 0000000..e8c780d
--- /dev/null
+++ b/lib/dml/moodle_recordset.php
@@ -0,0 +1,50 @@
+<?php  //$Id$
+
+/**
+ * Abstarct class for resultsets returned from database functions.
+ * This is a simple Iterator with needed recorset closing support.
+ *
+ * The differnece from old recorset is that the records are returned
+ * as objects, not arrays. You should use "foreach ($recordset as $record) {}"
+ * followed by "$recordset->close()".
+ *
+ * Do not forget to close all recordsets when they are not needed anymore!
+ */
+abstract class moodle_recordset implements Iterator {
+
+    /**
+     * Returns current record - fields as object properties, lowercase
+     * @return object
+     */
+    //public abstract function current();
+
+    /**
+     * Returns the key of current row
+     * @return int current row
+     */
+    //public abstract function key();
+
+    /**
+     * Moves forward to next row
+     * @return void
+     */
+    //public abstract function next();
+
+    /**
+     * Revinds back to the first row
+     * @return void
+     */
+    //public abstract function rewind();
+
+    /**
+     * Did we reach the end?
+     * @return boolean
+     */
+    //public abstract function valid();
+
+    /**
+     * Free resources and connections, recordset can not be used anymore.
+     * @return void
+     */
+    public abstract function close();
+}
\ No newline at end of file

diff --git a/lib/dml/oci8po_adodb_moodle_recordset.php b/lib/dml/oci8po_adodb_moodle_recordset.php
index 436fb253bf2fcbf2096ffdef61bc41ccc8a270db..7e9769584a41b8a9f60f48a577895a7a59a670ac 100644 (file)
--- a/lib/dml/oci8po_adodb_moodle_recordset.php
+++ b/lib/dml/oci8po_adodb_moodle_recordset.php
@@ -1,4 +1,6 @@
-<?php
+<?php  //$Id$
+
+require_once($CFG->libdir.'/dml/adodb_moodle_recordset.php');
 
 /**
  * Oracle moodle recordest with special hacks

diff --git a/lib/dml/pdo_moodle_recordset.php b/lib/dml/pdo_moodle_recordset.php
index 6ffb023939c907a04b94b3b879f3ece1a31d03b1..1a4e24c4c8b016d3af32bef633b5b01dd2a509c4 100644 (file)
--- a/lib/dml/pdo_moodle_recordset.php
+++ b/lib/dml/pdo_moodle_recordset.php
@@ -1,10 +1,12 @@
-<?php
+<?php  //$Id$
+
+require_once($CFG->libdir.'/dml/moodle_recordset.php');
 
 /**
  * Experimental pdo recordset
  * @package dmlib
  */
-class adodb_moodle_recordset implements moodle_recordset {
+class pdo_moodle_recordset extends moodle_recordset {
     private $sht;
 
     public function __construct($sth) {

diff --git a/lib/dmllib.php b/lib/dmllib.php
index 2e46da7f7d93f9044d6209dcf19a28d7106b0b0a..e2875451ab37406b9b992c49a4d28fc073f4f306 100644 (file)
--- a/lib/dmllib.php
+++ b/lib/dmllib.php
@@ -138,22 +138,6 @@ function setup_DB() {
     return true;
 }
 
-/**
- * Interface definitions for resultsets returned from database functions.
- * This is a simple Iterator with needed recorset closing support.
- *
- * The differnece from old recorset is that the records are returned
- * as objects, not arrays. You should use "foreach ($recordset as $record) {}".
- *
- * Do not forget to close all recordsets when they are not needed anymore!
- */
-interface moodle_recordset extends Iterator {
-    /**
-     * Free resources and connections, recordset can not be used anymore.
-     */
-    public function close();
-}
-
 /**
  * Detail database field information.
  * Based on ADOFieldObject.