Fixes (#595)

Author: YourTechBud

mission-control

@@ -34,9 +34,10 @@ func (s *SQL) getDescribeDetails(ctx context.Context, project, col string) ([]ut
 	args := []interface{}{}
 	switch utils.DBType(s.dbType) {
 	case utils.MySQL:
-		queryString = `select column_name as 'Field', data_type as 'Type',is_nullable as 'Null',column_key as 'Key',coalesce(column_default,'') as 'Default',coalesce(column_default,'') as 'Extra'
-		from information_schema.columns
-		where (table_name,table_schema) = (?,?);`
+		queryString = `select column_name as 'Field',is_nullable as 'Null',column_key as 'Key',coalesce(column_default,'') as 'Default',coalesce(column_default,'') as 'Extra',
+case when data_type = 'varchar' then concat(DATA_TYPE,'(',CHARACTER_MAXIMUM_LENGTH,')') else DATA_TYPE end as 'Type'
+from information_schema.columns
+where (table_name,table_schema) = (?,?);`
 		args = append(args, col, project)
 
 	case utils.Postgres:

modules/crud/sql/describe.go

@@ -50,7 +50,7 @@ func (m *Module) processStagedEvents(t *time.Time) {
 			timestamp := eventDoc.Timestamp
 			currentTimestamp := t.UTC().UnixNano() / int64(time.Millisecond)
 
-			if currentTimestamp > timestamp {
+			if currentTimestamp >= timestamp {
 				go m.processStagedEvent(eventDoc)
 			}
 		}
@@ -92,6 +92,7 @@ func (m *Module) processStagedEvent(eventDoc *model.EventDocument) {
 		internalToken, err := m.auth.GetInternalAccessToken()
 		if err != nil {
 			log.Println("Eventing: Couldn't trigger functions -", err)
+			return
 		}
 
 		scToken, err := m.auth.GetSCAccessToken()
@@ -137,7 +138,7 @@ func (m *Module) processStagedEvent(eventDoc *model.EventDocument) {
 		time.Sleep(5 * time.Second)
 	}
 
-	if err := m.crud.InternalUpdate(ctx, m.config.DBType, m.project, m.config.Col, m.generateFailedEventRequest(eventDoc.ID, "Max retires limit reached")); err != nil {
+	if err := m.crud.InternalUpdate(context.Background(), m.config.DBType, m.project, m.config.Col, m.generateFailedEventRequest(eventDoc.ID, "Max retires limit reached")); err != nil {
 		log.Println("Eventing staged event handler could not update event doc:", err)
 	}
 }

modules/eventing/handle_staged.go

@@ -801,7 +801,7 @@ func TestSchema_generateCreationQueries(t *testing.T) {
 				currentSchema: schemaCollection{"table1": SchemaFields{"col1": &SchemaFieldType{FieldName: "col1", Kind: typeBoolean, IsDefault: true, Default: true}}},
 			},
 			fields:  fields{crud: crudSqlServer, project: "test"},
-			want:    []string{"ALTER TABLE test.table1 ALTER COLUMN col1 DROP DEFAULT"},
+			want:    []string{"ALTER TABLE test.table1 DROP CONSTRAINT c_col1"},
 			wantErr: false,
 		},
 		{

modules/schema/creation_test.go

@@ -82,12 +82,15 @@ func generateInspection(dbType, col string, fields []utils.FieldType, foreignkey
 
 			if utils.DBType(dbType) == utils.Postgres {
 				// split "'default-value'::text" to "default-value"
-				s := strings.Split(field.FieldDefault, ",")
+				s := strings.Split(field.FieldDefault, "::")
 				field.FieldDefault = s[0]
+				if fieldDetails.Kind == typeString || fieldDetails.Kind == typeDateTime || fieldDetails.Kind == TypeID {
+					field.FieldDefault = strings.Split(field.FieldDefault, "'")[1]
+				}
 			}
 
 			// add string between quotes
-			if fieldDetails.Kind == typeString {
+			if fieldDetails.Kind == typeString || fieldDetails.Kind == TypeID || fieldDetails.Kind == typeDateTime {
 				field.FieldDefault = fmt.Sprintf("\"%s\"", field.FieldDefault)
 			}
 			fieldDetails.Default = field.FieldDefault

modules/schema/inspection.go

@@ -2,7 +2,7 @@ package schema
 
 import (
 	"bytes"
-	"html/template"
+	"text/template"
 )
 
 func generateSDL(schemaCol schemaCollection) (string, error) {

modules/schema/template.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/gorilla/mux"
+
 	"github.com/spaceuptech/space-cloud/model"
 	"github.com/spaceuptech/space-cloud/utils/graphql"
 )
@@ -29,9 +30,11 @@ func HandleGraphQLRequest(graphql *graphql.Module) http.HandlerFunc {
 		json.NewDecoder(r.Body).Decode(&req)
 		defer r.Body.Close()
 
+		w.Header().Set("Content-Type", "application/json")
+
 		if projectID != pid {
-			//throw some error
-			w.WriteHeader(http.StatusInternalServerError) //http status codee
+			// throw some error
+			w.WriteHeader(http.StatusInternalServerError)
 			json.NewEncoder(w).Encode(map[string]string{"error": "project id doesn't match"})
 			return
 		}
@@ -49,7 +52,7 @@ func HandleGraphQLRequest(graphql *graphql.Module) http.HandlerFunc {
 				return
 			}
 
-			w.WriteHeader(http.StatusOK) //http status codee
+			w.WriteHeader(http.StatusOK)
 			json.NewEncoder(w).Encode(map[string]interface{}{"data": op})
 			return
 		})