@@ -1,177 +1,29 @@ <?php -/** @addtogroup arch */ -/** @{ */ - -/** @file - * Generic database interface. - */ - -/** Generic database interface. - */ class database extends PDO { - public $dbtype; - - /** Constructor. Create database connection and set some connection attributes. - */ - public function __construct($dsn, $user = null, $pass = null) + public function __construct($path) { - $this->dbtype = explode(':', $dsn); - $this->dbtype = $this->dbtype[0]; - $opts = array(); - //if ($this->dbtype == 'pgsql') - // $opts = DEBUG_ENABLED ? array() : array(PDO::ATTR_PERSISTENT => true); - parent::__construct($dsn, $user, $pass, $opts); - if ($this->dbtype == 'mysql') - { - $this->query("SET NAMES utf8"); - $this->query("SET sql_mode = 'ANSI'"); -// $this->query("SET TRANSACTION ISOLATION LEVEL SERIALIZABLE"); - } + parent::__construct("sqlite:".$path); $this->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); } - /** Check if result has exactly one row. - */ - private function fetch_one_row($result, $style) - { - $row = $result->fetch($style); - if (!$row) - throw new Exception("expecting single row, got none"); - $next_row = $result->fetch($style); - if (!$next_row) - return $row; - throw new Exception("expecting single row, got more"); - } - - /** Make SQL query to that returns single row. - */ - public function row_iquery() - { - $args = func_get_args(); - $res = call_user_func_array(array($this, "iquery"), $args); - $row = $this->fetch_one_row($res, PDO::FETCH_BOTH); - return $row; - } - - /** Make SQL query to that returns first column from the first row. - */ - public function col_iquery() - { - $args = func_get_args(); - $res = call_user_func_array(array($this, "iquery"), $args); - $row = $this->fetch_one_row($res, PDO::FETCH_NUM); - return $row[0]; - } - public function table_exists($name) { - return $GLOBALS['db']->col_iquery('SELECT COUNT(*) FROM pg_tables WHERE schemaname = ? AND tablename = ?', "public", $name) != 0; + $data = $GLOBALS['db']->iquery('SELECT COUNT(*) FROM sqlite_master WHERE type = ? AND name = ?', "table", $name)->fetchAll(); + return $data[0][0] > 0; } - /** Make intelligent SQL query. - * - * @param base_sql [string] SQL query string that may contain ? substitution parameter - * @param ... Substitution parameter values. - * @return PDOStatement object. - * - * @par Code: - * @code - * $db->iquery('INSERT INTO table(col1, col2) VALUES (?, ?)', (string)$col1, (int)$col2); - * $db->iquery('SELECT * FROM table WHERE col1 = ? AND col2 = ?', (string)$col1, (int)$col2); - * @endcode - */ public function iquery($base_sql) { $args = func_get_args(); $sql = array_shift($args); if (isset($args[0]) && is_array($args[0])) $args = $args[0]; - //X($sql."\n"); $stmt = $this->prepare($sql); $stmt->execute($args); return $stmt; } - - /** Make SQL query. - */ - public function query($sql) - { - //X($sql."\n\n"); - return parent::query($sql); - } - - /** Backup data. - * - * @param out_dbtype [string] Output for specified database type. - */ - public function backup($out_dbtype = 'pgsql') - { - if ($out_dbtype == 'pgsql') - echo "SET escape_string_warning = off;\n"; - - if ($this->dbtype == 'pgsql') - $tables = $this->query("SELECT table_name AS name FROM information_schema.tables WHERE table_schema = 'public'")->fetchAll(PDO::FETCH_NUM); - else - $tables = $this->query("SHOW TABLES")->fetchAll(PDO::FETCH_NUM); - - foreach ($tables as $table) - { - $name = $table[0]; - - echo "\n-- TABLE: $name\n\n"; - - // get table data - if ($this->dbtype == 'mysql') - $query = $this->query("SELECT * FROM `$name`"); - else - $query = $this->query("SELECT * FROM $name"); - $column_count = $query->columnCount(); - - // and metadata - $column_names = array(); - $metas = array(); - for ($i = 0; $i < $column_count; $i++) - { - $metas[$i] = $meta = $query->getColumnMeta($i); - if ($out_dbtype == 'mysql') - $column_names[] = '`'.$meta['name'].'`'; - else - $column_names[] = $meta['name']; - } - $column_names = implode(', ', $column_names); - - if ($out_dbtype == 'pgsql') - echo "ALTER TABLE $name DISABLE TRIGGER ALL;\n\n"; - - // create INSERTS - while ($row = $query->fetch(PDO::FETCH_NUM)) - { - $insert = "INSERT INTO $name ($column_names) VALUES ("; - for ($i = 0; $i < $column_count; $i++) - { - $mysql_int = isset($metas[$i]['native_type']) && $metas[$i]['native_type'] == 'LONG'; - $mysql_bool = !isset($metas[$i]['native_type']) && $metas[$i]['len'] == '1'; - $insert.= ($i ? ", " : ""); - if (is_null($row[$i])) - $insert.= 'NULL'; - else if (is_integer($row[$i]) || $mysql_int) - $insert.= $row[$i]; - else if (is_bool($row[$i]) || $mysql_bool) - $insert.= $row[$i] ? 'TRUE' : 'FALSE'; - else - $insert.= Q($row[$i]); - } - $insert.= ");\n"; - - echo $insert; - } - - if ($out_dbtype == 'pgsql') - echo "\nALTER TABLE $name ENABLE TRIGGER ALL;\n"; - } - } } /** Quote SQL string. @@ -185,6 +37,4 @@ function Q($s) return $GLOBALS['db']->quote($s); } -/** @} */ - ?> database.php @@ -24,12 +24,12 @@ class gtd_rpc_server extends json_rpc_server { public function _pre_call($method, $params) { - $GLOBALS['db'] = new database("pgsql:dbname=mygtd", "postgres", "heslo"); + $GLOBALS['db'] = new database("db/db.sqlite"); if (!$GLOBALS['db']->table_exists("tasks")) { - $GLOBALS['db']->query("CREATE TABLE categories (id SERIAL, name TEXT NOT NULL)"); - $GLOBALS['db']->query("CREATE TABLE tasks (id SERIAL, title TEXT NOT NULL, detail TEXT, category_id INTEGER NOT NULL, exdate DATE NOT NULL, done BOOLEAN NOT NULL)"); + $GLOBALS['db']->query("CREATE TABLE categories (id INTEGER PRIMARY KEY, name TEXT NOT NULL)"); + $GLOBALS['db']->query("CREATE TABLE tasks (id INTEGER PRIMARY KEY, title TEXT NOT NULL, detail TEXT, category_id INTEGER NOT NULL, exdate DATE NOT NULL, done BOOLEAN NOT NULL)"); $GLOBALS['db']->iquery("INSERT INTO categories (name) VALUES (?)", "Práce"); $GLOBALS['db']->iquery("INSERT INTO categories (name) VALUES (?)", "Osobní"); $GLOBALS['db']->iquery("INSERT INTO categories (name) VALUES (?)", "Ostatní"); @@ -43,21 +43,26 @@ class gtd_rpc_server extends json_rpc_server $obj = new stdClass; $obj->tasks = $GLOBALS['db']->iquery("SELECT *, tasks.category_id AS category FROM tasks ORDER BY id")->fetchAll(PDO::FETCH_ASSOC); foreach ($obj->tasks as &$task) + { $task['html'] = texy_process($task['detail']); + $task['done'] = $task['done'] == 'true'; + } $obj->categories = $GLOBALS['db']->iquery("SELECT * FROM categories ORDER BY id")->fetchAll(PDO::FETCH_ASSOC); return $obj; } public function createTask($task) { - $id = $GLOBALS['db']->col_iquery("INSERT INTO tasks(title, detail, exdate, category_id, done) VALUES (?, ?, ?, ?, ?) RETURNING id", + $GLOBALS['db']->iquery("INSERT INTO tasks(title, detail, exdate, category_id, done) VALUES (?, ?, ?, ?, ?)", $task->title, $task->detail, $task->exdate, (int)$task->category_id, $task->done ? 'true' : 'false'); + $id = $GLOBALS['db']->lastInsertId(); return array('id' => $id, 'html' => texy_process($task->detail)); } public function createCategory($name) { - $id = $GLOBALS['db']->col_iquery("INSERT INTO categories(name) VALUES (?) RETURNING id", $name); + $GLOBALS['db']->iquery("INSERT INTO categories(name) VALUES (?)", $name); + $id = $GLOBALS['db']->lastInsertId(); return array('id' => $id); } rpc.php 656c9d6f5cba0efd173dfe732238766923ff9048 Ondrej Jirman megous@megous.com http://github.com/megous/ajax-todo-list/commit/296cd29174f691212121c90d0263d77dc780420f 296cd29174f691212121c90d0263d77dc780420f 2009-01-15T13:44:41-08:00 2009-01-15T13:44:41-08:00 port to sqlite eac5427108c9178af2535b4baa0d1b883d655c9a Ondrej Jirman megous@megous.com