Changeset 136 for trunk/bin/module_maker/sql.cli.php

Timestamp:

Jun 3, 2006 7:47:48 PM (18 years ago)

Author:

scdev

Message:

Q - Merged branches/2.0singleton into trunk. Completed updating classes to use singleton methods. Implemented tests. Fixed some bugs. Changed some interfaces.

File:

• trunk/bin/module_maker/sql.cli.php (modified) (10 diffs)

trunk/bin/module_maker/sql.cli.php

@@ -30 +30 @@
 
 // Get DB tables.
-$qid = DB::query("SHOW TABLES");
+$qid = $db->query("SHOW TABLES");
 while (list($row) = mysql_fetch_row($qid)) {
     $tables[] = $row;
@@ -37 +37 @@
 // Make sure requested table is in database.
 if (!in_array($db_tbl, $tables)) {
-    die(sprintf("%s Warning: %s does not exist in database %s. Please select one of: \n\n%s\n\n", basename($_SERVER['argv'][0]), $db_tbl, App::getParam('db_name'), join("\n", $tables)));
+    die(sprintf("%s Warning: %s does not exist in database %s. Please select one of: \n\n%s\n\n", basename($_SERVER['argv'][0]), $db_tbl, $app->getParam('db_name'), join("\n", $tables)));
 }
 
@@ -46 +46 @@
 
 // Get DB table column info.
-$qid = DB::query("DESCRIBE " . DB::escapeString($db_tbl));
+$qid = $db->query("DESCRIBE " . $db->escapeString($db_tbl));
 while ($row = mysql_fetch_row($qid)) {
     $cols[] = $row;
@@ -76 +76 @@
         } else if ('added_by_user_id' == $field || 'modified_by_user_id' == $field) {
             // Toggle types.
-            $c[$field] = "'\" . DB::escapeString(\$auth->getVal('user_id')) . \"'";
+            $c[$field] = "'\" . \$db->escapeString(\$auth->getVal('user_id')) . \"'";
         } else if ('added_datetime' == $field || 'modified_datetime' == $field) {
             // DB record insertion datetime.
@@ -82 +82 @@
         } else {
             // Default. Just insert data.
-            $c[$field] = "'\" . DB::escapeString(\$frm['$field']) . \"'";
+            $c[$field] = "'\" . \$db->escapeString(\$frm['$field']) . \"'";
         }
     }
@@ -107 +107 @@
 echo <<<E_O_F
     // Insert record data.
-    DB::query("
+    \$db->query("
         INSERT INTO $db_tbl (
             $db_keys
@@ -133 +133 @@
 echo <<<E_O_F
     // Update record data.
-    DB::query("
+    \$db->query("
         UPDATE $db_tbl SET$key_eq_val
-        WHERE $primary_key = '" . DB::escapeString(\$frm['$primary_key']) . "'
+        WHERE $primary_key = '" . \$db->escapeString(\$frm['$primary_key']) . "'
     ");
 E_O_F;
@@ -148 +148 @@
 $delim = 'WHERE';
 if (!empty($primary_key)) {
-    $where_clause = "            $delim $primary_key = '\" . DB::escapeString(\$frm['$primary_key']) . \"'\n";
+    $where_clause = "            $delim $primary_key = '\" . \$db->escapeString(\$frm['$primary_key']) . \"'\n";
     $delim = 'AND';
 }
@@ -155 +155 @@
         continue;
     }
-    $where_clause .= "            $delim $k = '\" . DB::escapeString(\$frm['$k']) . \"'\n";
+    $where_clause .= "            $delim $k = '\" . \$db->escapeString(\$frm['$k']) . \"'\n";
     $delim = 'AND';
 }
 echo <<<E_O_F
         // Delete record data.
-        DB::query("
+        \$db->query("
             DELETE FROM $db_tbl
 $where_clause        ");
@@ -183 +183 @@
 if (!isset($op) || 'search' == $op) {
 $search_skip_columns = array('added_datetime', 'added_by_user_id', 'modified_datetime', 'modified_by_user_id', 'publish', 'featured');
-$search_columns = $db_tbl . '.' . join(" LIKE '%\" . DB::escapeString(\$qry_words[\$i]) . \"%'\n                    OR $db_tbl.", array_diff(array_keys($c), $search_skip_columns));
+$search_columns = $db_tbl . '.' . join(" LIKE '%\" . \$db->escapeString(\$qry_words[\$i]) . \"%'\n                    OR $db_tbl.", array_diff(array_keys($c), $search_skip_columns));
 echo <<<E_O_F
             \$where_clause .= (empty(\$where_clause) ? 'WHERE' : 'AND') . "
                 (
-                    $search_columns LIKE '%" . DB::escapeString(\$qry_words[\$i]) . "%'
+                    $search_columns LIKE '%" . \$db->escapeString(\$qry_words[\$i]) . "%'
                 )
             ";