Commit 90474848 authored by Pietro Apollo's avatar Pietro Apollo
Browse files

VARCHAR problem solved

parent 3169ce87

src/java/it/inaf/oats/ia2/tap/utils/UpdateTapSchema.java

+13 −2
Original line number Diff line number Diff line
@@ -211,8 +211,10 @@ public class UpdateTapSchema { 
                            size = 0;

                            datatype = "adql:REAL";

                        }

                        else if(columnsResultSet.getString(2).contains("char")

                                || columnsResultSet.getString(2).contains("CHAR"))

                        //else if(columnsResultSet.getString(2).contains("char")

                        //        || columnsResultSet.getString(2).contains("CHAR"))

                        else if(columnsResultSet.getString(2).startsWith("char")

                                || columnsResultSet.getString(2).startsWith("CHAR"))

                        {

                            int beginIndex = columnsResultSet.getString(2).indexOf('(');

                            int endIndex = columnsResultSet.getString(2).indexOf(')');
@@ -220,6 +222,15 @@ public class UpdateTapSchema { 
                                    .substring(beginIndex + 1, endIndex));

                            datatype = "adql:CHAR";

                        }

                        else if(columnsResultSet.getString(2).startsWith("varchar")

                                || columnsResultSet.getString(2).startsWith("VARCHAR"))

                        {

                            int beginIndex = columnsResultSet.getString(2).indexOf('(');

                            int endIndex = columnsResultSet.getString(2).indexOf(')');

                            size = Integer.parseInt(columnsResultSet.getString(2)

                                    .substring(beginIndex + 1, endIndex));

                            datatype = "adql:VARCHAR";

                        }

                        else if(columnsResultSet.getString(2).contains("timestamp")

                                || columnsResultSet.getString(2).contains("TIMESTAMP"))

                        {