SQLite: Better editing in tables without a primary key

diff --git a/adminer/drivers/sqlite.inc.php b/adminer/drivers/sqlite.inc.php
index c471f939330e7e53a2a969d4c8ee61f3f197cce5..9693e3242ae4f5b4bf6e356afc65f23f06e38fc1 100644 (file)
--- a/adminer/drivers/sqlite.inc.php
+++ b/adminer/drivers/sqlite.inc.php
@@ -252,6 +252,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
        function table_status($name = "") {
                $return = array();
                foreach (get_rows("SELECT name AS Name, type AS Engine FROM sqlite_master WHERE type IN ('table', 'view')" . ($name != "" ? " AND name = " . q($name) : "")) as $row) {
+                       $row["Oid"] = "t";
                        $row["Auto_increment"] = "";
                        $return[$row["Name"]] = $row;
                }

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 1e239faff86b63b1fbff72db8c39bee60e2de02c..a1d3737fe0150dc61fe1d8dd63554a5e4067407a 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -4,8 +4,10 @@ $table_status = table_status($TABLE);
 $indexes = indexes($TABLE);
 $fields = fields($TABLE);
 $foreign_keys = column_foreign_keys($TABLE);
+$oid = "";
 if ($table_status["Oid"] == "t") {
-       $indexes[] = array("type" => "PRIMARY", "columns" => array("oid"));
+       $oid = ($jush == "sqlite" ? "rowid" : "oid");
+       $indexes[] = array("type" => "PRIMARY", "columns" => array($oid));
 }
 parse_str($_COOKIE["adminer_import"], $adminer_import);
 
@@ -27,7 +29,7 @@ list($select, $group) = $adminer->selectColumnsProcess($columns, $indexes);
 $where = $adminer->selectSearchProcess($fields, $indexes);
 $order = $adminer->selectOrderProcess($fields, $indexes);
 $limit = $adminer->selectLimitProcess();
-$from = ($select ? implode(", ", $select) : ($table_status["Oid"] == "t" ? "oid, " : "") . "*") . "\nFROM " . table($TABLE);
+$from = ($select ? implode(", ", $select) : ($oid ? "$oid, " : "") . "*") . "\nFROM " . table($TABLE);
 $group_by = ($group && count($group) < count($select) ? "\nGROUP BY " . implode(", ", $group) : "") . ($order ? "\nORDER BY " . implode(", ", $order) : "");
 
 if ($_GET["val"] && is_ajax()) {
@@ -257,7 +259,7 @@ if (!$columns) {
                        reset($select);
                        $rank = 1;
                        foreach ($rows[0] as $key => $val) {
-                               if ($table_status["Oid"] != "t" || $key != "oid") {
+                               if ($key != $oid) {
                                        $val = $_GET["columns"][key($select)];
                                        $field = $fields[$select ? ($val ? $val["col"] : current($select)) : $key];
                                        $name = ($field ? $adminer->fieldName($field, $rank) : "*");

diff --git a/changes.txt b/changes.txt
index 0c5d365a1ccd0da0fa7a32d61ecff422557024b3..60b0ca40476b997116b101f2d5ad337b3a791269 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,5 +1,6 @@
 Adminer 3.4.1-dev:
 SQLite: Full alter table
+SQLite: Better editing in tables without a primary key
 
 Adminer 3.4.0 (released 2012-06-30):
 Link to descending order