diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 39c6df7..0fcb425 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,13 +1,11 @@
-
-
-
-
-
-
+
+
+
+
@@ -15,14 +13,138 @@
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+ false
+ true
+ true
+
true
DEFINITION_ORDER
@@ -50,6 +172,7 @@
+
@@ -61,14 +184,17 @@
-
-
-
+
+
+
+
+
+
@@ -85,6 +211,13 @@
+
+
+
+
+
+ C:\Users\lopiu\AppData\Roaming\Subversion
+
@@ -93,20 +226,32 @@
1517154442513
-
+
+
+
+ 1517161745193
+
+
+
+ 1517161745193
+
+
-
+
+
-
+
+
+
@@ -132,12 +277,107 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -290,5 +530,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test.php b/test.php
index 66b4be3..9e5dd72 100644
--- a/test.php
+++ b/test.php
@@ -10,18 +10,7 @@
}
?>
-setCharset('utf8')
- ->setDatabaseName('user42163_onli');
-
-?>
+
@@ -33,20 +22,10 @@ $db = Database_Mysql::create('localhost', 'user42163_onli', '1W7y2E8u')
". $sql);
- // Рисуем табличку
+ $sql = db::c()->query('SELECT * FROM `lichka`')->fetch_assoc();
$table = "
\n";
- while ($row = mysql_fetch_assoc($result))
+ while ($sql)
{
$table .= "\n";
$table .= "Lichka\n";
@@ -58,18 +37,15 @@ if (isset($_GET['dbshow'])) {
}
$table .= " |
\n";
- $sql2 = "SELECT * FROM `paldelo`";
- // Скармливаем наш запрос MySQL
- $result2 = mysql_query($sql2) or die(mysql_error() ."
". $sql2);
- // Рисуем табличку
+ $sql2 = db::c()->query('SELECT * FROM `paldelo`')->fetch_assoc();
$table2 = "
\n";
- while ($row2 = mysql_fetch_assoc($result2))
+ while ($sql2)
{
$table2 .= "\n";
$table2 .= "Paldelo\n";
- $table2 .= " | ".$row2['id']." | \n";
- $table2 .= "".$row2['author']." | \n";
- $table2 .= "".$row2['text']." | \n";
+ $table2 .= "".$sql2['id']." | \n";
+ $table2 .= "".$sql2['author']." | \n";
+ $table2 .= "".$sql2['text']." | \n";
$table2 .= "
\n";
}
@@ -80,9 +56,6 @@ if (isset($_GET['dbshow'])) {
}
if (isset($_GET['phpinfo'])) phpinfo();
- #echo $asd.' - local test
';
- #echo $GLOBALS['asd'].' - global massive $GLOBALS test
';
- #echo $_GET['asd'].' - $_GET["asd"]';
echo "Склонности: ";
foreach (glob("i/align_*.{jpg,png,gif}", GLOB_BRACE) as $filename) echo " ";
@@ -98,29 +71,12 @@ if (isset($_GET['dbshow'])) {
foreach (glob("i/magic/*.{jpg,png,gif}", GLOB_BRACE) as $filename) echo " ";
// Получить все...
-$res = $db->query('SELECT * FROM `users` WHERE `id` = ?i','11263');
+$res = db::c()->query('SELECT * FROM `users` WHERE `id` = ?i',11263)->fetch_assoc();
// Последовательно получать в виде ассоциативных массивов
-while ($data = $res->fetch_assoc()) print_r($data['id']);
+while ($res) print_r($res['id']);
echo '
';
-$data = $res->fetch_assoc();
-print_r($data['id']);
+print_r($res['id']);
- /*
-function FixTables() {
- $tables = mysql_query('SHOW TABLES');
- while ($table = mysql_fetch_array($tables)) {
- mysql_query('ALTER TABLE `actions` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
- mysql_query('ALTER TABLE `actions` CONVERT TO CHARACTER SET utf8;');
- }
- echo " CONVERTED!!! ";
-}
-
-if (isset($_GET['dbfix'])) {
- mysql_connect('localhost', 'user42163_onli', '1W7y2E8u');
- mysql_select_db('user42163_onli');
- FixTables();
-}
-*/
?>