From 28b41056e3ea962dce1ad017a3c0a60252195e7a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 27 May 2009 15:07:27 -0700
Subject: Restructure things so that the application is now just another
 module. Kohana makes this type of transition fairly straightforward in that
 all controllers/helpers/etc are still located in the cascading filesystem
 without any extra effort, except that I've temporarily added a hack to force
 modules/gallery into the module path.

Rename what's left of "core" to be "application" so that it conforms
more closely to the Kohana standard (basically, just
application/config/config.php which is the minimal thing that you need
in the application directory)

There's still considerable work left to be done here.
---
 core/libraries/MY_Database.php | 92 ------------------------------------------
 1 file changed, 92 deletions(-)
 delete mode 100644 core/libraries/MY_Database.php

(limited to 'core/libraries/MY_Database.php')

diff --git a/core/libraries/MY_Database.php b/core/libraries/MY_Database.php
deleted file mode 100644
index c56f16e8..00000000
--- a/core/libraries/MY_Database.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class Database extends Database_Core {
-  protected $_table_names;
-
-  public function open_paren() {
-    $this->where[] = "(";
-    return $this;
-  }
-
-  public function close_paren() {
-    // Search backwards for the last opening paren and resolve it
-    $i = count($this->where) - 1;
-    $this->where[$i] .= ")";
-    while (--$i >= 0) {
-      if ($this->where[$i] == "(") {
-        // Remove the paren from the where clauses, and add it to the right of the operator of the
-        // next where clause.  If removing the paren makes the next where clause the first element
-        // in the where list, then the operator shouldn't be there.  It's there because we
-        // calculate whether or not we need an operator based on the number of where clauses, and
-        // the open paren seems like a where clause even though it isn't.
-        array_splice($this->where, $i, 1);
-        $this->where[$i] = preg_replace("/^(AND|OR) /", $i ? "\\1 (" : "(", $this->where[$i]);
-        return $this;
-      }
-    }
-
-    throw new Kohana_Database_Exception('database.missing_open_paren');
-  }
-
-  /**
-   * Parse the query string and convert any strings of the form `\([a-zA-Z0-9_]*?)\]
-   * table prefix . $1
-   */
-  public function query($sql = '') {
-    if (!empty($sql)) {
-      $sql = $this->add_table_prefixes($sql);
-    }
-    return parent::query($sql);
-  }
-
-  public function add_table_prefixes($sql) {
-    $prefix = $this->config["table_prefix"];
-    if (strpos($sql, "SHOW TABLES") === 0) {
-      /*
-       * Don't ignore "show tables", otherwise we could have a infinite
-       * @todo this may have to be changed if we support more than mysql
-       */
-      return $sql;
-    } else if (strpos($sql, "CREATE TABLE") === 0) {
-      // Creating a new table add it to the table cache.
-      $open_brace = strpos($sql, "{") + 1;
-      $close_brace = strpos($sql, "}", $open_brace);
-      $name = substr($sql, $open_brace, $close_brace - $open_brace);
-      $this->_table_names["{{$name}}"] = "{$prefix}$name";
-    }
-
-    if (!isset($this->_table_names)) {
-      // This should only run once on the first query
-      $this->_table_names =array();
-      $len = strlen($prefix);
-      foreach($this->list_tables() as $table_name) {
-        if ($len > 0) {
-          $naked_name = strpos($table_name, $prefix) !== 0 ?
-            $table_name : substr($table_name, $len);
-        } else {
-          $naked_name = $table_name;
-        }
-        $this->_table_names["{{$naked_name}}"] = $table_name;
-      }
-    }
-
-    return empty($this->_table_names) ? $sql : strtr($sql, $this->_table_names);
-  }
-}
\ No newline at end of file
-- 
cgit v1.2.3