🐛 fixs

🐛  fixs

Author: GaneshKandu

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,25 @@
+
+To help us resolve your issue more quickly, please use the following template:
+
+## Version Info
+  - KDBV version: ``` ? ```
+  - PHP version:  ``` ? ```
+  - MySQL version:  ``` ? ```
+  - Web server (Ex. Apache, nginx or IIS?) : ``` ? ```
+  - OS name and version:  ``` ? ```
+
+## Expected Behavior
+
+> Write here
+
+## Actual Behavior
+
+> Write here
+
+## Steps to Reproduce
+
+> Write here
+
+## Schema Dump of Latest version and old Version
+
+> Upload sql files

.gitignore

@@ -50,4 +50,5 @@ Temporary Items
 table.db
 index.php
 vendor/*
-composer.lock
+composer.lock
+log.txt

README.md

@@ -13,19 +13,48 @@ PHP 5.3+ and PDO extension installed
 
 ## Get Started
 
-### Install via composer
+## Install
 
-Add KDBV to composer.json configuration file.
+This library is designed to be installed via [Composer](https://getcomposer.org/doc/).
+
+Add the dependency into your projects composer.json.
+```
+{
+  "require": {
+    "ganeshkandu/kdbv": "*"
+  }
+}
 ```
-$ composer require ganeshkandu/kdbv
+
+Download the composer.phar
+``` bash
+curl -sS https://getcomposer.org/installer | php
 ```
 
-And update the composer
+Install the library.
+``` bash
+php composer.phar install
 ```
-$ composer update
+
+## or
+
+> To add in in your dependencies
+
+``` bash
+php composer.phar require ganeshkandu/kdbv
 ```
 
-## create kdbv databade
+## Autoloading
+
+This library requires an autoloader, if you aren't already using one you can include [Composers autoloader](https://getcomposer.org/doc/01-basic-usage.md#autoloading).
+
+``` php
+require('vendor/autoload.php');
+```
+
+## Usage
+
+### create kdbv databade
 
 ```php
 
@@ -64,7 +93,7 @@ $obj->make();
 
 ```
 
-## get mysql queries in array
+### get mysql queries in array
 
 ```php
 
@@ -101,7 +130,7 @@ $sql = $obj->query();
 
 ```
 
-## Upgrade mysql database
+### Upgrade mysql database
 
 ```php
 

src/kdbv.php

@@ -18,11 +18,11 @@ function init($pdodsn){
 
 		$dsn = "mysql:host={$pdodsn['HOST']};port={$pdodsn['PORT']};dbname={$pdodsn['DATABASE']};charset=$charset";
 
-		$opt = [
+		$opt = array(
 			PDO::ATTR_ERRMODE            => PDO::ERRMODE_EXCEPTION,
 			PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
 			PDO::ATTR_EMULATE_PREPARES   => false,
-		];
+		);
 
 		$this->pdo = new PDO($dsn, $pdodsn['USER'], $pdodsn['PASS'], $opt);
 	}

src/table.php

@@ -11,6 +11,7 @@ class tabledef{
 	public $pdodsn = null;
 	public $sql = array();
 	public $key = false;
+	public $extra = false;
 
 	function setTables(){
 
@@ -85,7 +86,7 @@ function addTablestatus(){
 
 			if(!empty($stat['Comment'])){
 				$stat['Comment'] = $this->quoteIdent($stat['Comment']);
-				$temp[] = "COMMENT  = {$stat['Comment']}";
+				$temp[] = "COMMENT  = '{$stat['Comment']}'";
 			}
 
 			$sql[] = "ALTER TABLE {$stat['Name']} ". implode(' ',$temp) .";";
@@ -107,12 +108,26 @@ function prepare_index_array($keys){
 
 		foreach($keys as $key){
 			if($key['Key_name'] == 'PRIMARY'){
-				$array[$key['Table']]['PRIMARY'][] = array('NAME' => $key['Column_name'],'Sub_part' => $key['Sub_part']);
+				$array[$key['Table']]['PRIMARY'][] = array(
+					'NAME' => $key['Column_name'],
+					'Sub_part' => $key['Sub_part'],
+					'Index_type' => $key['Index_type']
+				);
 			}else{
 				if($key['Non_unique']){
-					$array[$key['Table']]['index'][] = array('NAME' => $key['Key_name'],'COLUMN' => $key['Column_name'],'Sub_part' => $key['Sub_part']);
+					$array[$key['Table']]['index'][] = array(
+						'NAME' => $key['Key_name'],
+						'COLUMN' => $key['Column_name'],
+						'Sub_part' => $key['Sub_part'],
+						'Index_type' => $key['Index_type']
+					);
 				}else{
-					$array[$key['Table']]['unique'][] = array('NAME' => $key['Key_name'],'COLUMN' => $key['Column_name'],'Sub_part' => $key['Sub_part']);
+					$array[$key['Table']]['unique'][] = array(
+						'NAME' => $key['Key_name'],
+						'COLUMN' => $key['Column_name'],
+						'Sub_part' => $key['Sub_part'],
+						'Index_type' => $key['Index_type']
+					);
 				}
 			}
 		}
@@ -170,11 +185,13 @@ function getIndexs(){
 	function setTblDesc(){
 		$td = array();
 		$tables = db::get('table');
+		$this->key = true;
 		foreach($tables as $table){
 			$stmt = $this->pdo->query("SHOW FULL COLUMNS FROM $table;");
 			$row = $stmt->fetchall();
 			db::set($table,$this->TableDefinition($table,$row));
 		}
+		$this->key = false;
 	}
 
 	function TableDefinition($table,$columns){
@@ -250,11 +267,13 @@ function generateCollation($collation){
 	}
 
 	function generateDefaultCommand($definitions){
-/* 
-		if ($definitions['Extra'] == 'auto_increment') {
-			return "AUTO_INCREMENT";
+ 
+		if($this->extra){
+			if($definitions['Extra'] == 'auto_increment'){
+				return "AUTO_INCREMENT";
+			}
 		}
-*/
+
 		if (in_array($definitions['Default'], array('CURRENT_TIMESTAMP', 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP'))) {
 			return "DEFAULT {$definitions['Default']}";
 		}
@@ -290,6 +309,7 @@ function create_table($ctable){
 		$entries = array();
 		$primaryKey = array();
 		$keys = array();
+		//$this->extra = true;
 		foreach (db::get($ctable) as $columnName => $definitions) {
 			$entries[] = '`' . $columnName . '` ' . $definitions['Type'] . ' '. $this->generateCollation($definitions['Collation']) .' ' . $this->generateNullCommand($definitions['Null']) . ' ' . $this->generateDefaultCommand($definitions);
 
@@ -301,13 +321,14 @@ function create_table($ctable){
 				$keys[] = $columnName;
 			}
 		}
-
+		//$this->extra = false;
+		
 		if (count($primaryKey) > 0) {
-			$entries[] = 'PRIMARY KEY (`' . implode('`,`', $primaryKey) . '`)';
+			//$entries[] = 'PRIMARY KEY (`' . implode('`,`', $primaryKey) . '`)';
 		}
 
 		foreach ($keys as $key) {
-			$entries[] = 'KEY (`' . $key . '`)';
+			//$entries[] = 'KEY (`' . $key . '`)';
 		}
 
 		return "CREATE TABLE IF NOT EXISTS `{$ctable}` (" . implode(',', $entries) . ");";
@@ -436,7 +457,7 @@ function addKeys(){
 					$_primary[] = "`{$primary['NAME']}`$sub_part";
 				}
 				$columns = implode(",",$_primary);
-				$_temp[] = "ADD PRIMARY KEY ({$columns})";
+				$_temp[] = "\nADD PRIMARY KEY ({$columns})";
 			}
 			//ADDING INDEX KEY
 			if(isset($index['index'])){
@@ -451,7 +472,11 @@ function addKeys(){
 					foreach($this->tilde($_keys) as $no => $val){
 						$_indexs[] = "$val{$sub_part[$no]}";
 					}
-					$_temp[] = "ADD KEY `{$name}` (".implode(",",$_indexs).")";
+					$_key = '';
+					if($key['Index_type'] != 'BTREE'){
+						$_key = $key['Index_type'];
+					}
+					$_temp[] = "\nADD $_key KEY `{$name}` (".implode(",",$_indexs).")";
 				}
 			}
 			//ADDING INDEX UNIQUE KEY
@@ -467,7 +492,7 @@ function addKeys(){
 					foreach($this->tilde($_keys) as $no => $val){
 						$_indexs[] = "$val{$sub_part[$no]}";
 					}
-					$_temp[] = "ADD UNIQUE KEY `{$name}` (".implode(",",$_indexs).")";
+					$_temp[] = "\nADD UNIQUE KEY `{$name}` (".implode(",",$_indexs).")";
 				}
 			}
 
@@ -574,11 +599,13 @@ function execute($queries){
 				$stmt = $this->pdo->prepare($query);
 				$stmt->execute(array());
 			}catch (PDOException $e) {
- 				//echo "$query\n";
-				//echo $e->getCode();
-				//echo "\n";
-				//echo $e->getMessage();
-				//echo "\n";
+				if(defined('DEBUG')){
+					echo "$query\n";
+					echo $e->getCode();
+					echo "\n";
+					echo $e->getMessage();
+					echo "\n";
+				}
 			} 
 		}
 	}
@@ -613,7 +640,7 @@ function dropIndexs(){
 				$stmt = $this->pdo->query("SHOW FULL COLUMNS FROM $table;");
 				$row = $stmt->fetchall();
 				if($column = $this->check_autoincreate($this->TableDefinition($table,$row))){
-					$sql[$table.'_0_'.$row['Field']] = "ALTER TABLE `{$table}` MODIFY `{$column['NAME']}` INT;";
+					$sql[$table.'_0_'.$column['NAME']] = "ALTER TABLE `{$table}` MODIFY `{$column['NAME']}` INT;";
 				}
 				//droping primary key
 				foreach($index['PRIMARY'] as $keys){
@@ -627,7 +654,7 @@ function dropIndexs(){
 	}
 
 	function quoteIdent($field) {
-		return "`".str_replace("`","``",$field)."`";
+		return str_replace("`","``",$field);
 	}
 
 }