WebSVN – phpLibraryV2 – Diff – /head/DBQuery.class.php

              // must contain, at a minimum, columns whenrun timestamp, whoran varchar and query text
              // can be created with $this->buildAuditTable
              'auditTable' => '_activity_log'
            );
+      public function __construct( $server, $username, $password, $database ) {
+         parent::__construct(  $server, $username, $password, $database );
+      }
       /*
        * static function which simply parses out an error and returns
        * a string suitable for printing. NOTE: it includes line returns
       */
          $this->run();
          $useAssociativeArray = $save;
          if ( $this->parameters[ 'rowsAffected' ] == 1 ) {
             $this->parameters[ 'returnData' ] = $this->parameters[ 'returnData' ][0];
             return $this->parameters[ 'returnData' ];
-         } else
+         } else {
             $this->parameters['error'] = "$this->parameters[query] did not return a unique row in getOneRow";
+            print_r( $this->parameters['query'] ); die;
+         }
          return false;
       } // getOneRow
       // function returns the first column of the first row of data returned from query
+      }
       /**
        * runs an SQL script with multiple statements in it
+       *
+       * If $sql is an array, it is assumed each row is a separate query
+       *
+       * If $sql is a string, will separate it into different lines and
+       * execute them
+       *
        * NOTE: it does this by breaking it based on the semicolon, so
        * in some weird situations, it will break at the wrong place.
+       *
        */
       public function runSQLScript( $sql ) {
+         if ( is_array( $sql ) ) {
+            $queries = $sql;
+         } else {
-         $sql = $this->strip_sqlcomment( $sql );
+            $sql = $this->strip_sqlcomment( $sql );
-         $queries = explode( ";", $sql );
+            $queries = explode( ";", $sql );
+         }
          //print "<pre>" . print_r( $queries, true ) . '</pre>'; die;
          foreach ( $queries as $query ) {
             $this->doSQL( trim( implode( ' ', explode("\n",$query ) ) ) );
+         }
+      } // runSQLScript
+      /**
+       * Overrides real_escape_string to change behaviour slightly
+       *
+       * Will check if string is pure numeric and, if it is, will return
+       * as it is. Otherwise, will call real_escape_string, then wrap
+       * result in single quotes
+       */
+       public function my_escape_string( $string, $additionalEscapes = array() ) {
+          if ( is_numeric( $string ) )
+             return $string;
+          $string = $this->real_escape_string( $string );
+          if ( count( $additionalEscapes ) )
+             $string = addcslashes( $string, implode( '', $additionalEscapes ) );
+          return "'$string'";
+       }
+      /**
+       * Builds a query of form update $tablename set $fields where $where
+       *
+       * Creates a query that will update table $tablename. It assumes
+       * $fields is an array where the indexes are fieldnames and the values
+       * are the new values for the field. Will escape the values.
+       *
+       * Appends $where, again where index is a field name
+       */
+      public function updateQuery( $tablename, $where, $fields ) {
+         /*
+         print "<pre>updateQuery\n\ntable\n$tablename\n</pre>";
+         print "<pre>\nwhere\n" . print_r( $where, true ) . "\n</pre>";
+         print "<pre>fields\n" . print_r( $fields, true ) . "\n</pre>"; die;
+         */
+         $sql = '';
+         $updateFields = array();
+         foreach ( $fields as $fieldname => $value ) {
+            $updateFields[] = sprintf( "%s = %s", $fieldname, $this->my_escape_string( $value ) );
+         }
+         $sql = "update $tablename set " . implode( ", ", $updateFields );
+         $updateFields = array();
+         foreach ( $where as $fieldname => $value ) {
+            $updateFields[] = sprintf( "%s = %s", $fieldname, $this->my_escape_string( $value ) );
+         }
+         if ( count( $updateFields ) ) {
+            $sql .= ' where ' . implode( ' and ', $updateFields );
+         }
+         return $sql;
+      }
+      /**
+       * Creates an insert query from $fields
+       *
+       */
+       public function insertQuery( $tablename, $fields ) {
+          print "<pre>insertQuery\n\ntable\n$tablename\n</pre>";
+          print "<pre>fields\n" . print_r( $fields, true ) . "\n</pre>"; die;
+          $query = "insert into $tablename (" . implode( ',',array_keys($fields) );
+          $query .= " values (" . implode( ',', array_map( array($this, 'real_escape_string'), array_values( $fields ) ) );
+          return "$query)";
+       } // insertQuery
-      }
    } // class DBQuery
 /*
  *    $db = new DBQuery( '127.0.0.1', 'camp', 'camp', 'camp' );

Subversion Repositories phpLibraryV2

(root)/head/DBQuery.class.php – Rev 36 → 37