Changeset 2807

Timestamp:

11/13/08 19:57:47 (8 weeks ago)

Author:

rickc

Message:

Get RDBMS-specific code out of the file. This functions isn't currently used in Habari. Of the backends we are currently supporting, MySQL supports the function as written, Postgress appears to use EXEC instead of call and so needs a transformation written in it's sql_t() function, and SQLite doesn't support stored procedures at all, though it does support a form of dynamically loaded functions.

Fixes ticket #45.

Location:

trunk/htdocs/system

Files:

• classes/databaseconnection.php (modified) (3 diffs)
• schema/mysql/connection.php (modified) (1 diff)
• schema/pgsql/connection.php (modified) (1 diff)
• schema/sqlite/connection.php (modified) (1 diff)

trunk/htdocs/system/classes/databaseconnection.php

@@ -293 +293 @@
      * @experimental
      * @todo  EVERYTHING... :)
+     * Implemented in child classes. Most RDBMS use ANSI-92 syntax, 
+     * ( CALL procname ( param1, param2, ... ), 
+     * so they return the call to here. Those that don't, handle the call individually
      */
     public function execute_procedure( $procedure, $args = array() )
@@ -304 +307 @@
         }
 
-        /*
-         * Since RDBMS handle the calling of procedures
-         * differently, we need a simple abstraction
-         * mechanism here to build the appropriate SQL
-         * commands to call the procedure...
-         */
-        $driver = $pdo->getAttribute( PDO::ATTR_DRIVER_NAME );
-        switch ( $driver ) {
-            case 'mysql':
-            case 'pgsql':
-            case 'db2':
-                /*
-                 * These databases use ANSI-92 syntax for procedure calling:
-                 * CALL procname ( param1, param2, ... );
-                 */
-                $query = 'CALL ' . $procedure . '( ';
-                if ( count( $args ) > 0 ) {
-                    $query.= str_repeat( '?,', count( $args ) ); // Add the placeholders
-                    $query = substr( $query, 0, strlen( $query ) - 1 ); // Strip the last comma
-                }
-                $query.= ' )';
-                break;
-            case 'oracle':
-                die( sprinf(_t('not yet supported on %s'), $driver) );
-                break;
-        }
+        $query = 'CALL ' . $procedure . '( ';
+        if ( count( $args ) > 0 ) {
+            $query.= str_repeat( '?,', count( $args ) ); // Add the placeholders
+            $query = substr( $query, 0, strlen( $query ) - 1 ); // Strip the last comma
+        }
+        $query.= ' )';
+        $query = $this->sql_t( $query, $args );
 
         if ( $pdo_statement = $pdo->prepare( $query ) ) {
@@ -719 +703 @@
             }
         }
-
         // Put the upgrade functions into an array using the 0-padded revision + '_1' as the key
         $upgrade_functions = get_class_methods($this);

trunk/htdocs/system/schema/mysql/connection.php

@@ -249 +249 @@
 
     /**
+     * Execute a stored procedure
+     *
+     * @param   procedure   name of the stored procedure
+     * @param   args        arguments for the procedure
+     * @return  mixed       whatever the procedure returns...
+     */
+    public function execute_procedure( $procedure, $args = array() )
+    {
+        return parent::execute_procedure( $procedure, $args );
+    }
+
+    /**
      * Run all of the upgrades since the last database revision.
      *

trunk/htdocs/system/schema/pgsql/connection.php

@@ -330 +330 @@
 
     /**
+     * Execute a stored procedure
+     *
+     * @param   procedure   name of the stored procedure
+     * @param   args        arguments for the procedure
+     * @return  mixed       whatever the procedure returns...
+     */
+    public function execute_procedure( $procedure, $args = array() )
+    {
+        return parent::execute_procedure( $procedure, $args );
+    }
+
+    /**
      * Run all of the upgrades since the last database revision.
      *

trunk/htdocs/system/schema/sqlite/connection.php

@@ -144 +144 @@
 
     /**
+     * Execute a stored procedure
+     *
+     * @param   procedure   name of the stored procedure
+     * @param   args        arguments for the procedure
+     * @return  mixed       whatever the procedure returns...
+     * Not supported with SQLite
+     */
+    public function execute_procedure( $procedure, $args = array() )
+    {
+        die( _t( 'not yet supported on SQLite' ) );
+    }
+
+    /**
      * Run all of the upgrades since the last database revision.
      *